diff options
Diffstat (limited to 'libstdc++-v3/testsuite/testsuite_hooks.cc')
-rw-r--r-- | libstdc++-v3/testsuite/testsuite_hooks.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libstdc++-v3/testsuite/testsuite_hooks.cc b/libstdc++-v3/testsuite/testsuite_hooks.cc index 793c1dc6354..a2ace1156e4 100644 --- a/libstdc++-v3/testsuite/testsuite_hooks.cc +++ b/libstdc++-v3/testsuite/testsuite_hooks.cc @@ -42,7 +42,7 @@ #include <locale> #include <cxxabi.h> -namespace __gnu_cxx_test +namespace __gnu_test { #ifdef _GLIBCXX_MEM_LIMITS void @@ -155,8 +155,9 @@ namespace __gnu_cxx_test if (res != NULL) { string preLC_ALL = res; - for (func_callback::const_iterator i = l.begin(); i != l.end(); ++i) - (*i)(); + const func_callback::test_type* tests = l.tests(); + for (int i = 0; i < l.size(); ++i) + (*tests[i])(); string postLC_ALL= setlocale(LC_ALL, NULL); VERIFY( preLC_ALL == postLC_ALL ); } @@ -180,8 +181,9 @@ namespace __gnu_cxx_test const char* oldENV = getenv(env); if (!setenv(env, name, 1)) { - for (func_callback::const_iterator i = l.begin(); i != l.end(); ++i) - (*i)(); + const func_callback::test_type* tests = l.tests(); + for (int i = 0; i < l.size(); ++i) + (*tests[i])(); setenv(env, oldENV ? oldENV : "", 1); } else |