Changeset 2019 for XIOS/dev/dev_trunk_graph/src/xios_spl.hpp

Timestamp:

01/22/21 12:00:29 (3 years ago)

Author:

yushan

Message:

Graph intermedia commit to a tmp branch

File:

• XIOS/dev/dev_trunk_graph/src/xios_spl.hpp (modified) (5 diffs)

XIOS/dev/dev_trunk_graph/src/xios_spl.hpp

@@ -8 +8 @@
 #include <unordered_map>
 #include <memory>
-
 // standard C
 #include <cstring>
 #include <cstdlib>
+
 #include <cmath>
+// bug in cmath header => macro collision marco with DOMAIN
+#ifdef DOMAIN
+#undef DOMAIN
+#endif
+
 #include <ctime>
 
@@ -24 +29 @@
 #include <queue>
 #include <valarray>
+#include <tuple>
+
 // Flux.
 #include <iostream>
@@ -32 +39 @@
 #include <boost/cast.hpp>
 #include <boost/current_function.hpp>
+
 /// Map ///
 #define xios_map std::map
@@ -49 +57 @@
 typedef std::size_t        StdSize;
 
-typedef  unsigned short int   ushort;
-typedef  unsigned int         uint;
-typedef  unsigned long int    ulong;
+typedef  unsigned short int      ushort;
+typedef  unsigned int            uint;
+typedef  unsigned long int       ulong;
+typedef  long long int           longlong;
+typedef  unsigned long long int  ulonglong;
 
 const size_t stringArrayLen=255 ;
@@ -59 +69 @@
 #include "log.hpp"
 using namespace std;
-using namespace boost ;
-
+//using namespace boost ;
 
 #endif //__XIOS_SPL__