Improve portability. Fix C++98 build on MacOS

Author: flanglet

src/BitStreamException.hpp

@@ -50,7 +50,7 @@ namespace kanzi
 
        int error() const { return _code; }
 
-       virtual ~BitStreamException() _GLIBCXX_USE_NOEXCEPT {}
+       virtual ~BitStreamException() NOEXCEPT {}
    };
 
 }

src/Context.hpp

@@ -31,11 +31,11 @@ namespace kanzi
    // The extra memory used does not matter for the application context since
    // the map is small.
    typedef struct ContextVal {
-       bool isString;
        int64 lVal;
        std::string sVal;
+       bool isString;
 
-       ContextVal(bool b, int64 val, const std::string& str) : isString(b), lVal(val), sVal(str) {}
+       ContextVal(bool b, int64 val, const std::string& str) : lVal(val), sVal(str), isString(b) {}
        ContextVal() { isString = false; lVal = 0; }
    } ctxVal;
 

src/Global.hpp

@@ -58,7 +58,7 @@ namespace kanzi {
 
    private:
        Global();
-       ~Global() {};
+       ~Global() {}
 
        static const Global _singleton;
        static const int LOG2_4096[257]; // 4096*Math.log2(x)

src/Memory.hpp

@@ -21,11 +21,11 @@ limitations under the License.
 #include "types.hpp"
 
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(BSD)
-#include <machine/endian.h>
-#elif defined(OS_MACOSX)
-        #include <machine/endian.h>
+    #include <machine/endian.h>
+#elif defined(__APPLE__)
+    #include <machine/endian.h>
 #elif defined(__linux__) || defined(__linux) || defined(__gnu_linux__)
-#include <endian.h>
+    #include <endian.h>
 #endif
 
 

src/concurrent.hpp

@@ -198,7 +198,10 @@ class Task {
    #define ATOMIC_BOOL std::atomic_bool
 
 #else
-   #if __cplusplus < 201103L
+   #if defined(__APPLE__)
+        #define ATOMIC_INT std::atomic_int
+        #define ATOMIC_BOOL std::atomic_bool
+   #elif __cplusplus < 201103L
         // ! Stubs for NON CONCURRENT USAGE !
         // Used to compile and provide a non concurrent version AND
         // when atomic.h is not available (VS C++)

src/io/IOException.hpp

@@ -45,7 +45,7 @@ namespace kanzi
 
        int error() const { return _code; }
 
-       ~IOException() _GLIBCXX_USE_NOEXCEPT{}
+       ~IOException() NOEXCEPT {}
    };
 
 }

src/types.hpp

@@ -127,20 +127,18 @@ limitations under the License.
       #endif
    #endif
 
-    #ifndef _GLIBCXX_USE_NOEXCEPT
-       #define _GLIBCXX_USE_NOEXCEPT
-    #endif
-
     // Notice: in Visual Studio (prior to VS2017 version 15.7)
     // __cplusplus always defaults to 199711L (aka C++98) !!! (unless
     // the extra option /Zc:__cplusplus is added to the command line).
     // Otherwise, using the _MSVC_LANG macro returns the proper C++ version.
     #if __cplusplus >= 201103L
        // C++ 11
        #define FINAL final
+       #define NOEXCEPT noexcept
        #include <cstdint>
     #else
        #define FINAL
+       #define NOEXCEPT throw()
 
        #if defined(_MSC_VER)
           #if _MSC_VER < 1300
@@ -167,12 +165,15 @@ limitations under the License.
              typedef unsigned char uint8_t;
              typedef unsigned short uint16_t;
              typedef unsigned int uint32_t;
-             typedef signed long int64_t;
-             typedef unsigned long uint64_t;
+
+             #if !defined(__APPLE__)
+                 typedef signed long int64_t;
+                 typedef unsigned long uint64_t;
+             #endif
        #endif
 
 
-      #if !defined(_MSC_VER) || _MSC_VER < 1910
+      #if !defined(nullptr)
           #define nullptr NULL
       #endif
     #endif
@@ -193,11 +194,17 @@ namespace kanzi
     typedef uint8_t uint8;
     typedef int16_t int16;
     typedef int32_t int32;
-    typedef int64_t int64;
     typedef uint16_t uint16;
     typedef uint32_t uint;
     typedef uint32_t uint32;
-    typedef uint64_t uint64;
+
+    #if defined(__APPLE__)
+        typedef signed long int64;
+        typedef unsigned long uint64;
+    #else
+        typedef int64_t int64;
+        typedef uint64_t uint64;
+    #endif
 }
 
    #if defined(__MINGW32__)