Changeset 114 for trunk/gsdl/lib/text_t.h

Timestamp:

1999-01-19T14:38:20+13:00 (25 years ago)

Author:

rjmcnab

Message:

Made the source more portable.

File:

• trunk/gsdl/lib/text_t.h (modified) (2 diffs)

trunk/gsdl/lib/text_t.h

@@ -14 +14 @@
 #define TEXT_T_H
 
-#ifndef USE_OBJECTSPACE
+#include "gsdlconf.h"
+
+#if defined(GSDL_USE_OBJECTSPACE)
+#  include <ospace\std\vector>
+#  include <ospace\std\list>
+#  include <ospace\std\set>
+#elif defined(GSDL_USE_STL_H)
+#  include <vector.h>
+#  include <list.h>
+#  include <set.h>
+#else
 #  include <vector>
 #  include <list>
 #  include <set>
-#else
-#  include <ospace\std\vector>
-#  include <ospace\std\list>
-#  include <ospace\std\set>
 #endif
 
 // use the standard namespace
-#ifdef __GNUG__
-// namespaces are broken in current version of gcc
-#else
-#  ifndef USE_OBJECTSPACE
+#if defined(GSDL_USE_OBJECTSPACE)
+using namespace ospace::std;
+#elif !defined(GSDL_NAMESPACE_BROKEN)
 using namespace std;
-#  else
-#    ifndef OS_NO_NAMESPACE
-using namespace ospace::std;
-#    endif
-#  endif
 #endif
 
@@ -42 +42 @@
 class outconvertclass;
 
+
+// just in case the compiler requires it :-)
+inline void destroy(unsigned short *) {};
 
 typedef vector<unsigned short> usvector;