mockpp-commits

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/3party/ministl/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12114/3party/ministl/tests

Modified Files:
	ministl_test.cpp 
Log Message:
optionally disable ministl namespace

Index: ministl_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/tests/ministl_test.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ministl_test.cpp	29 Dec 2005 19:29:50 -0000	1.7
+++ ministl_test.cpp	17 Mar 2006 08:40:52 -0000	1.8
@@ -56,19 +56,19 @@
 {
   std::cout << "Start map iter-test: \n";
 
-  ministl::map<int, unsigned> mm;
-  ministl::pair<int, unsigned> p(11, 22u);
-  mm.insert(ministl::make_pair(11, 22u));
+  MINISTL_NS::map<int, unsigned> mm;
+  MINISTL_NS::pair<int, unsigned> p(11, 22u);
+  mm.insert(MINISTL_NS::make_pair(11, 22u));
   mm.insert(p);
   mm.insert(p);
 
   if (mm.size() != 1)
     return 1;
 
-  mm.insert(ministl::make_pair(111, 222u));
-  mm.insert(ministl::make_pair(1111, 2222u));
+  mm.insert(MINISTL_NS::make_pair(111, 222u));
+  mm.insert(MINISTL_NS::make_pair(1111, 2222u));
 
-  ministl::map<int, unsigned>::iterator fit = mm.begin();
+  MINISTL_NS::map<int, unsigned>::iterator fit = mm.begin();
   while (fit != mm.end())
   {
     std::cout << "fit++ " << (*fit).first
@@ -86,13 +86,13 @@
 {
   std::cout << "Start multimap iter-test: \n";
 
-  ministl::multimap<unsigned, signed> mm;
-  mm.insert(ministl::make_pair(3u, 2));
-  mm.insert(ministl::make_pair(10u, 2));
-  mm.insert(ministl::make_pair(1u, 22));
-  mm.insert(ministl::make_pair(10u, 22));
-  mm.insert(ministl::make_pair<unsigned, signed>(1u, 222));
-  mm.insert(ministl::make_pair(2u, 22));
+  MINISTL_NS::multimap<unsigned, signed> mm;
+  mm.insert(MINISTL_NS::make_pair(3u, 2));
+  mm.insert(MINISTL_NS::make_pair(10u, 2));
+  mm.insert(MINISTL_NS::make_pair(1u, 22));
+  mm.insert(MINISTL_NS::make_pair(10u, 22));
+  mm.insert(MINISTL_NS::make_pair<unsigned, signed>(1u, 222));
+  mm.insert(MINISTL_NS::make_pair(2u, 22));
 
   // lower_bound
   // upper_bound
@@ -100,7 +100,7 @@
   if (mm.size() != 6)
     return 1;
 
-  ministl::multimap<unsigned, signed>::iterator fit = mm.begin();
+  MINISTL_NS::multimap<unsigned, signed>::iterator fit = mm.begin();
   if ((*fit++).first != 1) return 1;
   if ((*fit++).first != 1) return 1;
   if ((*fit++).first != 2) return 1;
@@ -124,14 +124,14 @@
 
 bool vector_test()
 {
-  ministl::vector<unsigned> vv;
+  MINISTL_NS::vector<unsigned> vv;
   vv.push_back(1u);
   vv.push_back(2u);
   vv.push_back(3u);
 
   std::cout << "Start vector iter-test:\n";
 
-  ministl::vector<unsigned>::iterator fit = vv.begin();
+  MINISTL_NS::vector<unsigned>::iterator fit = vv.begin();
   if (*fit != 1)
     return 1;
 
@@ -147,7 +147,7 @@
 
   std::cout << "reverse iter-test:\n";
 
-  ministl::vector<unsigned>::reverse_iterator rit = vv.rbegin();
+  MINISTL_NS::vector<unsigned>::reverse_iterator rit = vv.rbegin();
   if (*rit != 3)
     return 1;
 
@@ -169,7 +169,7 @@
 
 bool set_test()
 {
-  ministl::set<int> ss;
+  MINISTL_NS::set<int> ss;
   ss.insert(2);
   if (ss.size() != 1)
     return 1;