mockpp-commits

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

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

Modified Files:
	algo.h basic_string.h defalloc.h function.h list map set 
	simplevec.h string vector 
Log Message:
fixes in ministl

Index: function.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/function.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- function.h	29 Nov 2005 23:18:05 -0000	1.2
+++ function.h	30 Nov 2005 21:46:34 -0000	1.3
@@ -22,4 +22,5 @@
  *                 mi...@in...
  */
 
-#include <ministl/function.h>
+#include <ministl/functional>
+//using namespace ministl;

Index: map
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/map,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- map	29 Nov 2005 23:18:05 -0000	1.2
+++ map	30 Nov 2005 21:46:34 -0000	1.3
@@ -157,7 +157,7 @@
   public:
     typedef keyT key_type;
     typedef pair<const keyT, valT> value_type;
-    typedef unsigned long size_type;
+    typedef std::size_t size_type;
     typedef simplevec<value_type *> rep_type;
     typedef mapIterator<keyT, valT, cmpT> iterator;
     typedef mapConstIterator<keyT, valT, cmpT> const_iterator;

Index: set
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/set,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- set	29 Nov 2005 23:18:05 -0000	1.2
+++ set	30 Nov 2005 21:46:34 -0000	1.3
@@ -30,9 +30,8 @@
 #include <ministl/simplevec.h>
 #include <ministl/functional>
 #include <ministl/pair>
-#ifndef __GNUG__
-#include <ministl/bool.h>
-#endif
+
+//#include <ministl/bool.h>
 
 namespace ministl
 {
@@ -156,7 +155,7 @@
   {
   public:
     typedef valT value_type;
-    typedef unsigned long size_type;
+    typedef std::size_t size_type;
     typedef simplevec<value_type *> rep_type;
     typedef setIterator<valT, cmpT> iterator;
     typedef setConstIterator<valT, cmpT> const_iterator;

Index: string
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/string,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- string	29 Nov 2005 23:24:18 -0000	1.3
+++ string	30 Nov 2005 21:46:34 -0000	1.4
@@ -17,6 +17,8 @@
 #error Must use C++ for BSTRING.H
 #endif
 
+#include <ministl/vector>
+
 #ifndef MINISTL_MBSTRING_H
 #define MINISTL_MBSTRING_H
 
@@ -35,9 +37,7 @@
 
 // bool.h
 
-#ifndef __GNUG__
-#include <ministl/bool.h>
-#endif
+// #include <ministl/bool.h>
 
 // a typedef is less sweeping than a #define for "bool"
 #ifndef __BOOL_DEFINED
@@ -85,13 +85,11 @@
 #define _THROW_LENGTH_OUTRANGE
 #define _THROW_ALLOC_LENGTH_OUTRANGE
 
-#include <ministl/vector>
-
 #ifdef __MMULTITHREAD
 #include "mutex.h"
 #endif
 
-const size_t NPOS  = (size_t)(-1);
+const size_t NPOS  = (std::size_t)(-1);
 
 enum capacity { default_size, reserve };
 
@@ -182,7 +180,8 @@
     }
   };
 
-template<> struct string_char_baggage<char>
+template<>
+struct string_char_baggage<char>
 {
 
 typedef char char_type;
@@ -261,6 +260,7 @@
 
 #ifdef MOCKPP_UNICODE
 
+template<>
 struct string_char_baggage<wchar_t>
 {
 
@@ -488,10 +488,11 @@
 
   public:
 #if 1
-    typedef unsigned long size_type;
+    typedef std::size_t size_type;
 #endif
     typedef  charT                       char_type;
     typedef  string_char_baggage<charT>  baggage_type;
+    enum { npos = NPOS };
 
     basic_string () _THROW_ALLOC ;
 
@@ -2615,8 +2616,10 @@
 
 typedef  basic_string<char>     cstring;
 typedef  basic_string<char>     string;
-//typedef  basic_string<wchar_t>  wstring;
 
+#ifdef MOCKPP_UNICODE
+typedef  basic_string<wchar_t>  wstring;
+#endif
 
 /* The following is a workaround for a compiler bug in some versions
 of the Apogee compiler. This looks pretty weird, and it shouldn't
@@ -2627,7 +2630,6 @@
 {
   pointer->~basic_string();
 }
-
 #endif
 
 } // namespace ministl

Index: list
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/list,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- list	29 Nov 2005 23:18:05 -0000	1.2
+++ list	30 Nov 2005 21:46:34 -0000	1.3
@@ -213,7 +213,7 @@
 {
     typedef listNode<T> node;
   public:
-    typedef unsigned long size_type;
+    typedef std::size_t size_type;
     typedef listIterator<T> iterator;
     typedef listConstIterator<T> const_iterator;
   private:

Index: vector
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/vector,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vector	29 Nov 2005 23:18:05 -0000	1.2
+++ vector	30 Nov 2005 21:46:34 -0000	1.3
@@ -45,7 +45,7 @@
   public:
     typedef T* iterator;
     typedef const T* const_iterator;
-    typedef unsigned long size_type;
+    typedef std::size_t size_type;
 
   private:
     size_type _last, _size;

Index: defalloc.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/defalloc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- defalloc.h	29 Nov 2005 23:18:05 -0000	1.2
+++ defalloc.h	30 Nov 2005 21:46:34 -0000	1.3
@@ -13,10 +13,12 @@
  *
  */
 
+//#include <new>
+
+
 #ifndef MINISTL_DEFALLOC_H
 #define MINISTL_DEFALLOC_H
 
-#include <new>
 
 namespace ministl
 {

Index: basic_string.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/basic_string.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- basic_string.h	29 Nov 2005 23:18:05 -0000	1.1
+++ basic_string.h	30 Nov 2005 21:46:34 -0000	1.2
@@ -25,4 +25,6 @@
 #include <ministl/string>
 using ministl::string;
 using ministl::cstring;
+#ifdef MOCKPP_UNICODE
 using ministl::wstring;
+#endif

Index: algo.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/algo.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- algo.h	29 Nov 2005 23:18:05 -0000	1.2
+++ algo.h	30 Nov 2005 21:46:34 -0000	1.3
@@ -22,5 +22,5 @@
  *                 mi...@in...
  */
 
-#include <ministl/algo>
-using namespace ministl;
+#include <ministl/algorithm>
+//using namespace ministl;

Index: simplevec.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/simplevec.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- simplevec.h	29 Nov 2005 23:18:05 -0000	1.2
+++ simplevec.h	30 Nov 2005 21:46:34 -0000	1.3
@@ -43,7 +43,7 @@
   public:
     typedef T* iterator;
     typedef const T* const_iterator;
-    typedef unsigned long size_type;
+    typedef std::size_t size_type;
   private:
     size_type _last, _size;
     T *_buf;