Changeset 2f7a97d in tol

Timestamp:

Aug 21, 2015, 4:39:38 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

4ccf4d7c

Parents:

fc134ac

Message:

size_t Read/Write

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6820 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/OIS

Files:

• tol_oiscreator.h (modified) (1 diff)
• tol_oisloader.h (modified) (2 diffs)

tol/OIS/tol_oiscreator.h

@@ -68 +68 @@
   bool Write(const unsigned BINT64&  x, BStream* stream);
   // REVIEW: for compatibility size_t will be written/read as 4 bytes
-  bool Write(const          size_t&  x, BStream* stream)
+#if defined(_LP64) || defined(_WIN64)
+   bool Write(const          size_t&  x, BStream* stream)
   {
     unsigned int _x = (unsigned int)x;
     return this->Write( _x, stream );
   }
+#endif
   bool Write(const          float&   x, BStream* stream);
   bool Write(const          double&  x, BStream* stream);

tol/OIS/tol_oisloader.h

@@ -103 +103 @@
   bool Read(unsigned BINT64&  x, BStream* stream);
   // REVIEW: for compatibility size_t will be written/read as 4 bytes
+#if defined(_LP64) || defined(_WIN64)
   bool Read(size_t &     x, BStream* stream)
   {
@@ -113 +114 @@
     return ok;
   }
-  bool Read(         float&   x, BStream* stream);
+#endif
+   bool Read(         float&   x, BStream* stream);
   bool Read(         double&  x, BStream* stream);
   bool Read(BText& v, BStream* stream);