Merge branch 'develop' into staticptrfix

This commit is contained in:
jzmaddock
2020-01-07 19:00:38 +00:00
committed by GitHub
7 changed files with 179 additions and 8 deletions

View File

@ -193,7 +193,7 @@ BOOST_REGEX_DECL bool BOOST_REGEX_CALL is_combining_implementation(boost::uint_l
//
// these are the POSIX collating names:
//
BOOST_REGEX_DECL extern const char* const def_coll_names[] = {
static const char* def_coll_names[] = {
"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "alert", "backspace", "tab", "newline",
"vertical-tab", "form-feed", "carriage-return", "SO", "SI", "DLE", "DC1", "DC2", "DC3", "DC4", "NAK",
"SYN", "ETB", "CAN", "EM", "SUB", "ESC", "IS4", "IS3", "IS2", "IS1", "space", "exclamation-mark",
@ -214,7 +214,7 @@ BOOST_REGEX_DECL extern const char* const def_coll_names[] = {
// little more - but this will have to do for
// now:
BOOST_REGEX_DECL extern const char* const def_multi_coll[] = {
static const char* def_multi_coll[] = {
"ae",
"Ae",
"AE",