Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r64938 - trunk/libs/tokenizer/test
From: andrey.semashev_at_[hidden]
Date: 2010-08-21 04:45:02


Author: andysem
Date: 2010-08-21 04:45:00 EDT (Sat, 21 Aug 2010)
New Revision: 64938
URL: http://svn.boost.org/trac/boost/changeset/64938

Log:
Added explicit std qualifiers to avoid name clash of boost and STL equal algorithms

Text files modified:
   trunk/libs/tokenizer/test/examples.cpp | 108 ++++++++++++++++++---------------------
   1 files changed, 51 insertions(+), 57 deletions(-)

Modified: trunk/libs/tokenizer/test/examples.cpp
==============================================================================
--- trunk/libs/tokenizer/test/examples.cpp (original)
+++ trunk/libs/tokenizer/test/examples.cpp 2010-08-21 04:45:00 EDT (Sat, 21 Aug 2010)
@@ -11,6 +11,7 @@
 #include <iostream>
 #include <iterator>
 #include <string>
+#include <algorithm>
 #include <boost/tokenizer.hpp>
 #include <boost/array.hpp>
 
@@ -18,86 +19,81 @@
 
 int test_main( int /*argc*/, char* /*argv*/[] )
 {
- using namespace std;
   using namespace boost;
-
+
   // Use tokenizer
   {
- const string test_string = ";;Hello|world||-foo--bar;yow;baz|";
- string answer[] = { "Hello", "world", "foo", "bar", "yow", "baz" };
- typedef tokenizer<char_separator<char> > Tok;
- char_separator<char> sep("-;|");
- Tok t(test_string, sep);
- BOOST_REQUIRE(equal(t.begin(),t.end(),answer));
- }
- {
- const string test_string = ";;Hello|world||-foo--bar;yow;baz|";
- string answer[] = { "", "", "Hello", "|", "world", "|", "", "|", "",
- "foo", "", "bar", "yow", "baz", "|", "" };
- typedef tokenizer<char_separator<char> > Tok;
- char_separator<char> sep("-;", "|", boost::keep_empty_tokens);
- Tok t(test_string, sep);
- BOOST_REQUIRE(equal(t.begin(), t.end(), answer));
+ const std::string test_string = ";;Hello|world||-foo--bar;yow;baz|";
+ std::string answer[] = { "Hello", "world", "foo", "bar", "yow", "baz" };
+ typedef tokenizer<char_separator<char> > Tok;
+ char_separator<char> sep("-;|");
+ Tok t(test_string, sep);
+ BOOST_REQUIRE(std::equal(t.begin(),t.end(),answer));
+ }
+ {
+ const std::string test_string = ";;Hello|world||-foo--bar;yow;baz|";
+ std::string answer[] = { "", "", "Hello", "|", "world", "|", "", "|", "",
+ "foo", "", "bar", "yow", "baz", "|", "" };
+ typedef tokenizer<char_separator<char> > Tok;
+ char_separator<char> sep("-;", "|", boost::keep_empty_tokens);
+ Tok t(test_string, sep);
+ BOOST_REQUIRE(std::equal(t.begin(), t.end(), answer));
   }
   {
- const string test_string = "This,,is, a.test..";
- string answer[] = {"This","is","a","test"};
+ const std::string test_string = "This,,is, a.test..";
+ std::string answer[] = {"This","is","a","test"};
     typedef tokenizer<> Tok;
     Tok t(test_string);
- BOOST_REQUIRE(equal(t.begin(),t.end(),answer));
+ BOOST_REQUIRE(std::equal(t.begin(),t.end(),answer));
   }
 
   {
- const string test_string = "Field 1,\"embedded,comma\",quote \\\", escape \\\\";
- string answer[] = {"Field 1","embedded,comma","quote \""," escape \\"};
+ const std::string test_string = "Field 1,\"embedded,comma\",quote \\\", escape \\\\";
+ std::string answer[] = {"Field 1","embedded,comma","quote \""," escape \\"};
     typedef tokenizer<escaped_list_separator<char> > Tok;
     Tok t(test_string);
- BOOST_REQUIRE(equal(t.begin(),t.end(),answer));
-
+ BOOST_REQUIRE(std::equal(t.begin(),t.end(),answer));
   }
 
   {
- const string test_string = ",1,;2\\\";3\\;,4,5^\\,\'6,7\';";
- string answer[] = {"","1","","2\"","3;","4","5\\","6,7",""};
+ const std::string test_string = ",1,;2\\\";3\\;,4,5^\\,\'6,7\';";
+ std::string answer[] = {"","1","","2\"","3;","4","5\\","6,7",""};
     typedef tokenizer<escaped_list_separator<char> > Tok;
     escaped_list_separator<char> sep("\\^",",;","\"\'");
     Tok t(test_string,sep);
- BOOST_REQUIRE(equal(t.begin(),t.end(),answer));
-
+ BOOST_REQUIRE(std::equal(t.begin(),t.end(),answer));
   }
 
   {
- const string test_string = "12252001";
- string answer[] = {"12","25","2001"};
+ const std::string test_string = "12252001";
+ std::string answer[] = {"12","25","2001"};
     typedef tokenizer<offset_separator > Tok;
     boost::array<int,3> offsets = {{2,2,4}};
     offset_separator func(offsets.begin(),offsets.end());
     Tok t(test_string,func);
- BOOST_REQUIRE(equal(t.begin(),t.end(),answer));
-
+ BOOST_REQUIRE(std::equal(t.begin(),t.end(),answer));
   }
 
   // Use token_iterator_generator
   {
-
- const string test_string = "This,,is, a.test..";
- string answer[] = {"This","is","a","test"};
+ const std::string test_string = "This,,is, a.test..";
+ std::string answer[] = {"This","is","a","test"};
     typedef token_iterator_generator<char_delimiters_separator<char> >::type Iter;
- Iter begin = make_token_iterator<string>(test_string.begin(),
+ Iter begin = make_token_iterator<std::string>(test_string.begin(),
       test_string.end(),char_delimiters_separator<char>());
     Iter end;
- BOOST_REQUIRE(equal(begin,end,answer));
+ BOOST_REQUIRE(std::equal(begin,end,answer));
   }
 
   {
- const string test_string = "Field 1,\"embedded,comma\",quote \\\", escape \\\\";
- string answer[] = {"Field 1","embedded,comma","quote \""," escape \\"};
+ const std::string test_string = "Field 1,\"embedded,comma\",quote \\\", escape \\\\";
+ std::string answer[] = {"Field 1","embedded,comma","quote \""," escape \\"};
     typedef token_iterator_generator<escaped_list_separator<char> >::type Iter;
- Iter begin = make_token_iterator<string>(test_string.begin(),
+ Iter begin = make_token_iterator<std::string>(test_string.begin(),
       test_string.end(),escaped_list_separator<char>());
     Iter begin_c(begin);
     Iter end;
- BOOST_REQUIRE(equal(begin,end,answer));
+ BOOST_REQUIRE(std::equal(begin,end,answer));
 
     while(begin_c != end)
     {
@@ -105,39 +101,37 @@
        ++begin_c;
     }
     BOOST_REQUIRE(begin_c.at_end());
-
   }
 
   {
- const string test_string = "12252001";
- string answer[] = {"12","25","2001"};
+ const std::string test_string = "12252001";
+ std::string answer[] = {"12","25","2001"};
     typedef token_iterator_generator<offset_separator>::type Iter;
     boost::array<int,3> offsets = {{2,2,4}};
     offset_separator func(offsets.begin(),offsets.end());
- Iter begin = make_token_iterator<string>(test_string.begin(),
+ Iter begin = make_token_iterator<std::string>(test_string.begin(),
       test_string.end(),func);
- Iter end= make_token_iterator<string>(test_string.end(),
+ Iter end= make_token_iterator<std::string>(test_string.end(),
       test_string.end(),func);
- BOOST_REQUIRE(equal(begin,end,answer));
-
+ BOOST_REQUIRE(std::equal(begin,end,answer));
   }
-
+
   // Test copying
   {
- const string test_string = "abcdef";
+ const std::string test_string = "abcdef";
     token_iterator_generator<offset_separator>::type beg, end, other;
     boost::array<int,3> ar = {{1,2,3}};
     offset_separator f(ar.begin(),ar.end());
- beg = make_token_iterator<string>(test_string.begin(),test_string.end(),f);
-
+ beg = make_token_iterator<std::string>(test_string.begin(),test_string.end(),f);
+
     ++beg;
     other = beg;
     ++other;
 
     BOOST_REQUIRE(*beg=="bc");
     BOOST_REQUIRE(*other=="def");
-
- other = make_token_iterator<string>(test_string.begin(),
+
+ other = make_token_iterator<std::string>(test_string.begin(),
         test_string.end(),f);
 
     BOOST_REQUIRE(*other=="a");
@@ -145,10 +139,10 @@
 
   // Test non-default constructed char_delimiters_separator
   {
- const string test_string = "how,are you, doing";
- string answer[] = {"how",",","are you",","," doing"};
+ const std::string test_string = "how,are you, doing";
+ std::string answer[] = {"how",",","are you",","," doing"};
     tokenizer<> t(test_string,char_delimiters_separator<char>(true,",",""));
- BOOST_REQUIRE(equal(t.begin(),t.end(),answer));
+ BOOST_REQUIRE(std::equal(t.begin(),t.end(),answer));
   }
 
   return 0;


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk