diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-10 12:33:15 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-10 12:33:15 +0000 |
| commit | 6bce34a549b9966860a142f5381a9fc1fe68c68c (patch) | |
| tree | 0c01ae67572f2c58f907cf08f6cb91b1529a80c1 /usr/src/cmd | |
| parent | c2e53e4331d7069621f6df5fc7b73c4dbc20ec67 (diff) | |
| parent | ccbce734fa32e42c5bcbf1594753738697898823 (diff) | |
| download | illumos-joyent-6bce34a549b9966860a142f5381a9fc1fe68c68c.tar.gz | |
[illumos-gate merge]
commit ccbce734fa32e42c5bcbf1594753738697898823
12124 sort: cast between incompatible function types
commit a1cdd5a67f3bf3e60db3f3a77baef63640ad91a4
12176 util-tests: need ctf commands on path and C locale
commit 50d967713af8725306d090dd29033d9efe924715
12139 make: definition of implicit copy constructor is deprecated
commit d59679dc4ee5ea26c61e7762a3f7a6f74a1f4c2c
12163 mpt_sas: Collateral damage caused by dead SATA disk
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/make/Makefile.com | 1 | ||||
| -rw-r--r-- | usr/src/cmd/make/include/mksh/defs.h | 1 | ||||
| -rw-r--r-- | usr/src/cmd/sort/common/initialize.c | 18 |
3 files changed, 16 insertions, 4 deletions
diff --git a/usr/src/cmd/make/Makefile.com b/usr/src/cmd/make/Makefile.com index dcc587439e..fc76730f2a 100644 --- a/usr/src/cmd/make/Makefile.com +++ b/usr/src/cmd/make/Makefile.com @@ -14,6 +14,7 @@ MAKE_INCLUDE= $(SRC)/cmd/make/include CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(MAKE_INCLUDE) $(MAKE_DEFS) +CCFLAGS += -_gcc4=-std=gnu++0x # So that it's set even for the libraries we build TEXT_DOMAIN = SUNW_OST_OSCMD diff --git a/usr/src/cmd/make/include/mksh/defs.h b/usr/src/cmd/make/include/mksh/defs.h index 9ad58c4e61..0cf3d837c8 100644 --- a/usr/src/cmd/make/include/mksh/defs.h +++ b/usr/src/cmd/make/include/mksh/defs.h @@ -804,6 +804,7 @@ public: // constructors iterator() : node(0) {} iterator(entry *node_) : node(node_) {} + iterator(const iterator&) = default; // dereference operator Name operator->() const { return node->name; } diff --git a/usr/src/cmd/sort/common/initialize.c b/usr/src/cmd/sort/common/initialize.c index 376fac5b04..bb0089ac72 100644 --- a/usr/src/cmd/sort/common/initialize.c +++ b/usr/src/cmd/sort/common/initialize.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "initialize.h" #ifndef TEXT_DOMAIN @@ -109,6 +107,18 @@ initialize_pre(sort_t *S) set_signal_jmp(); } +static int +strcoll_cmp(void *s1, void *s2, flag_t f __unused) +{ + return (strcoll(s1, s2)); +} + +static int +wcscoll_cmp(void *s1, void *s2, flag_t f __unused) +{ + return (wcscoll(s1, s2)); +} + void initialize_post(sort_t *S) { @@ -124,7 +134,7 @@ initialize_post(sort_t *S) field_initialize(S); if (S->m_single_byte_locale) { - S->m_compare_fn = (cmp_fcn_t)strcoll; + S->m_compare_fn = strcoll_cmp; S->m_coll_convert = field_convert; F = S->m_fields_head; @@ -153,7 +163,7 @@ initialize_post(sort_t *S) F = F->f_next; } } else { - S->m_compare_fn = (cmp_fcn_t)wcscoll; + S->m_compare_fn = wcscoll_cmp; S->m_coll_convert = field_convert_wide; F = S->m_fields_head; |