aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/include/std/regex
diff options
context:
space:
mode:
authorTim Shen <timshen91@gmail.com>2014-01-07 19:17:50 +0000
committerTim Shen <timshen@gcc.gnu.org>2014-01-07 19:17:50 +0000
commitf43cc2a68d43a47f8020f1feaf74404c341cbe14 (patch)
treed9af9aa0a221012eb9c79a16fa98756258ed36f3 /libstdc++-v3/include/std/regex
parent8b2721dab070d3e5e680bf08d8bbb49d055fbcbe (diff)
downloadgcc-f43cc2a68d43a47f8020f1feaf74404c341cbe14.zip
gcc-f43cc2a68d43a47f8020f1feaf74404c341cbe14.tar.gz
gcc-f43cc2a68d43a47f8020f1feaf74404c341cbe14.tar.bz2
regex_compiler.h (_AnyMatcher<>::_AnyMatcher(), [...]): Fix _AnyMatcher behavior of POSIX style and move _M_flags to template parameter...
2014-01-07 Tim Shen <timshen91@gmail.com> * include/bits/regex_compiler.h (_AnyMatcher<>::_AnyMatcher(), _AnyMatcher<>::operator(), _AnyMatcher<>::_M_apply(), _CharMatcher<>::_CharMatcher(), _CharMatcher<>::_M_translate(), _BracketMatcher<>::_BracketMatcher(), _BracketMatcher<>::operator(), _BracketMatcher<>::_M_add_char(), _BracketMatcher<>::_M_add_collating_element(), _BracketMatcher<>::_M_add_equivalence_class(), _BracketMatcher<>::_M_add_character_class(), _BracketMatcher<>::_M_make_range(), _BracketMatcher<>::_M_ready(), _BracketMatcher<>::_M_apply(), _BracketMatcher<>::_M_make_cache()): Fix _AnyMatcher behavior of POSIX style and move _M_flags to template parameter; Add cache for _BracketMatcher. Adjust declarations from here... * include/bits/regex.h (basic_regex<>::imbue()): ...to here. Also, imbuing a regex will trigger a recompilation to rebuild the cache. * include/bits/regex_compiler.tcc (_Compiler<>::_M_atom(), _Compiler<>::_M_bracket_expression()): Adjust matchers' caller for different template bool parameters. * include/bits/regex_executor.h: Remove unnecessary declarations. * include/std/regex: Adjust including orders. * testsuite/28_regex/traits/char/user_defined.cc: New. * testsuite/28_regex/traits/wchar_t/user_defined.cc: New. From-SVN: r206400
Diffstat (limited to 'libstdc++-v3/include/std/regex')
-rw-r--r--libstdc++-v3/include/std/regex4
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/regex b/libstdc++-v3/include/std/regex
index 442a095..9395f50 100644
--- a/libstdc++-v3/include/std/regex
+++ b/libstdc++-v3/include/std/regex
@@ -56,11 +56,11 @@
#include <bits/regex_constants.h>
#include <bits/regex_error.h>
-#include <bits/regex_scanner.h>
#include <bits/regex_automaton.h>
+#include <bits/regex.h>
+#include <bits/regex_scanner.h>
#include <bits/regex_compiler.h>
#include <bits/regex_executor.h>
-#include <bits/regex.h>
#endif // C++11