Changeset 11769

Timestamp:

2006-05-03T16:50:30+12:00 (18 years ago)

Author:

mdewsnip

Message:

A couple of fixes for compiling on Windows.

File:

• trunk/gsdl/src/oaiservr/resumptiontoken.h (modified) (2 diffs)

trunk/gsdl/src/oaiservr/resumptiontoken.h

@@ -6 +6 @@
 #include "text_t.h"
 
+// use the standard namespace
+#if !defined (GSDL_NAMESPACE_BROKEN)
+#if defined(GSDL_USE_OBJECTSPACE)
+using namespace ospace::std;
+#else
 using namespace std;
+#endif
+#endif
 
 class ResumptionToken
@@ -28 +35 @@
   int     getPosition() { return startItem; }
   int     getOffsetDepth() { return this->browsePosition.size(); }
-  int     setOffset(int depth, int position) { this->browsePosition[depth] = position; }
+  void    setOffset(int depth, int position) { this->browsePosition[depth] = position; }
   int getOffset(int offset) { return this->browsePosition[offset]; }
   bool isValid();