[Mockpp-commits] mockpp/3party/ministl/tests ministl_test.cpp,1.8,1.9
Brought to you by:
ewald-arnold
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:26
|
Update of /cvsroot/mockpp/mockpp/3party/ministl/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/3party/ministl/tests Modified Files: ministl_test.cpp Log Message: more namespace disabling Index: ministl_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/ministl/tests/ministl_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ministl_test.cpp 17 Mar 2006 08:40:52 -0000 1.8 +++ ministl_test.cpp 5 Apr 2006 17:03:36 -0000 1.9 @@ -54,7 +54,7 @@ bool map_test() { - std::cout << "Start map iter-test: \n"; + MINISTL_STD_NS::cout << "Start map iter-test: \n"; MINISTL_NS::map<int, unsigned> mm; MINISTL_NS::pair<int, unsigned> p(11, 22u); @@ -71,12 +71,12 @@ MINISTL_NS::map<int, unsigned>::iterator fit = mm.begin(); while (fit != mm.end()) { - std::cout << "fit++ " << (*fit).first - << " " << (*fit).second << std::endl; + MINISTL_STD_NS::cout << "fit++ " << (*fit).first + << " " << (*fit).second << MINISTL_STD_NS::endl; ++fit; } - std::cout << "End map iter-test: \n"; + MINISTL_STD_NS::cout << "End map iter-test: \n"; return 0; } @@ -84,7 +84,7 @@ bool multimap_test() { - std::cout << "Start multimap iter-test: \n"; + MINISTL_STD_NS::cout << "Start multimap iter-test: \n"; MINISTL_NS::multimap<unsigned, signed> mm; mm.insert(MINISTL_NS::make_pair(3u, 2)); @@ -111,12 +111,12 @@ fit = mm.begin(); while (fit != mm.end()) { - std::cout << "fit++ " << (*fit).first - << " " << (*fit).second << std::endl; + MINISTL_STD_NS::cout << "fit++ " << (*fit).first + << " " << (*fit).second << MINISTL_STD_NS::endl; ++fit; } - std::cout << "End multimap iter-test: \n"; + MINISTL_STD_NS::cout << "End multimap iter-test: \n"; return 0; } @@ -129,39 +129,39 @@ vv.push_back(2u); vv.push_back(3u); - std::cout << "Start vector iter-test:\n"; + MINISTL_STD_NS::cout << "Start vector iter-test:\n"; MINISTL_NS::vector<unsigned>::iterator fit = vv.begin(); if (*fit != 1) return 1; while (fit != vv.end()) - std::cout << "fit++ " << *fit++ << std::endl; + MINISTL_STD_NS::cout << "fit++ " << *fit++ << MINISTL_STD_NS::endl; fit = vv.end(); if (*(fit-1) != 3) return 1; while (fit != vv.begin()) - std::cout << "fit-- " << *--fit << std::endl; + MINISTL_STD_NS::cout << "fit-- " << *--fit << MINISTL_STD_NS::endl; - std::cout << "reverse iter-test:\n"; + MINISTL_STD_NS::cout << "reverse iter-test:\n"; MINISTL_NS::vector<unsigned>::reverse_iterator rit = vv.rbegin(); if (*rit != 3) return 1; while (rit != vv.rend()) - std::cout << "rit++ " << *rit++ << std::endl; + MINISTL_STD_NS::cout << "rit++ " << *rit++ << MINISTL_STD_NS::endl; rit = vv.rend(); if (*(rit-1) != 1) return 1; while (rit != vv.rbegin()) - std::cout << "rit-- " << *--rit << std::endl; + MINISTL_STD_NS::cout << "rit-- " << *--rit << MINISTL_STD_NS::endl; - std::cout << "End vector iter-test: \n"; + MINISTL_STD_NS::cout << "End vector iter-test: \n"; return 0; } |