[Mockpp-commits] mockpp/3party/ministl defalloc.h,1.4,1.5 ministl.h,1.2,1.3 string,1.5,1.6 vector,1.4,1.5

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

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

Modified Files:
	defalloc.h ministl.h string vector 
Log Message:
fixes bcb5, msvc

Index: vector
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/vector,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vector	1 Dec 2005 18:15:08 -0000	1.4
+++ vector	28 Dec 2005 19:43:08 -0000	1.5
@@ -30,8 +30,6 @@
 
 #include <ministl/ministl.h>
 
-//#include <ministl/bool.h>
-
 #include <ministl/defalloc.h>
 #include <ministl/raw_iterator.h>
 #include <ministl/reverse_iterator.h>

Index: defalloc.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/defalloc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- defalloc.h	1 Dec 2005 18:15:08 -0000	1.4
+++ defalloc.h	28 Dec 2005 19:43:07 -0000	1.5
@@ -1,5 +1,6 @@
 /*
-* Copyright (C) 2005 Ewald Arnold mockpp at ewald-arnold dot de *
+ * Copyright (C) 2005 Ewald Arnold mockpp at ewald-arnold dot de
+ *
  * Copyright (c) 1994
  * Hewlett-Packard Company
  *
@@ -83,3 +84,4 @@
 
 
 #endif // MINISTL_DEFALLOC_H
+

Index: string
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/string,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- string	1 Dec 2005 18:15:08 -0000	1.5
+++ string	28 Dec 2005 19:43:08 -0000	1.6
@@ -17,11 +17,11 @@
 #error Must use C++ for BSTRING.H
 #endif
 
-#include <ministl/vector>
-
 #ifndef MINISTL_MBSTRING_H
 #define MINISTL_MBSTRING_H
 
+#include <ministl/vector>
+
 extern "C"
 {
 #ifdef MOCKPP_UNICODE
@@ -35,27 +35,6 @@
 
 //#include <ostream>
 
-// bool.h
-
-// #include <ministl/bool.h>
-
-// a typedef is less sweeping than a #define for "bool"
-#ifndef __BOOL_DEFINED
-//typedef int bool;
-#endif
-
-// bc4const
-
-#ifdef __BC4_STL
-#define __BC401_STL
-#endif
-
-#ifdef __BC401_STL
-#define __BC401_const
-#else
-#define __BC401_const const
-#endif
-
 namespace ministl
 {
 
@@ -233,7 +212,7 @@
   is_del (char_type c) _THROW_NONE
   {
     // characteristic function for delimiters of char_type
-    return isspace(c);
+    return std::isspace(c);
   }
 
   //
@@ -242,18 +221,18 @@
   static int
   compare (const char_type* s1, const char_type* s2, size_t n) _THROW_NONE
   {
-    return memcmp(s1, s2, n);
+    return std::memcmp(s1, s2, n);
   }
   static size_t
   length (const char_type* s) _THROW_NONE
   {
-    return strlen(s);
+    return std::strlen(s);
   }
   static char_type*
   copy (char_type* s1, const char_type* s2, size_t n) _THROW_NONE
   {
     // type cast required as memcpy returns void*
-    return (char_type*)memcpy(s1, s2, n);
+    return (char_type*)std::memcpy(s1, s2, n);
   }
 };
 

Index: ministl.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/ministl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ministl.h	29 Nov 2005 23:18:05 -0000	1.2
+++ ministl.h	28 Dec 2005 19:43:07 -0000	1.3
@@ -27,10 +27,9 @@
 #define __ministl_ministl_h__
 
 #ifndef assert
-#include <assert.h>
+#include <cassert>
 #endif
 
-
 #ifdef MINISTL_NDEBUG
 #define ministl_assert(exp)
 #else