Update of /cvsroot/mockpp/mockpp/3party/ministl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/3party/ministl
Modified Files:
ministl.h raw_iterator.h simplevec.h
Log Message:
more namespace disabling
Index: simplevec.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/simplevec.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- simplevec.h 17 Mar 2006 08:40:52 -0000 1.5
+++ simplevec.h 5 Apr 2006 17:03:36 -0000 1.6
@@ -42,7 +42,7 @@
public:
typedef T* iterator;
typedef const T* const_iterator;
- typedef std::size_t size_type;
+ typedef MINISTL_STD_NS::size_t size_type;
private:
size_type _last, _size;
T *_buf;
Index: raw_iterator.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/raw_iterator.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- raw_iterator.h 17 Mar 2006 08:40:52 -0000 1.4
+++ raw_iterator.h 5 Apr 2006 17:03:36 -0000 1.5
@@ -37,7 +37,7 @@
{
public:
- typedef std::size_t difference_type;
+ typedef MINISTL_STD_NS::size_t difference_type;
typedef T* pointer;
typedef const T* const_pointer;
typedef T& reference;
Index: ministl.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/ministl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ministl.h 19 Mar 2006 11:09:36 -0000 1.6
+++ ministl.h 5 Apr 2006 17:03:36 -0000 1.7
@@ -38,6 +38,12 @@
#define ministl_assert(exp) assert(exp)
#endif
+#ifdef MINISTL_NO_STD_NS
+# define MINISTL_STD_NS /* nothing */
+#else
+# define MINISTL_STD_NS std
+#endif
+
#ifdef MINISTL_NO_NAMESPACE
# define MINISTL_ANON_NS_START /* nothing */
# define MINISTL_NS /* nothing */
|
