[ENGINE] Change obj pool to normal struct instead of union, to suppor…

…t more compiler
apache · Sep 26, 2015 · a610def · a610def
1 parent 6f7873a
commit a610def
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/include/mxnet/base.h b/include/mxnet/base.h
@@ -42,7 +42,8 @@
  *  Used to support g++-4.6 and g++4.7
  */
 #if DMLC_USE_CXX11 && defined(__GNUC__) && !defined(__clang_version__)
-#if __GNUC__ == 4 && __GNUC_MINOR__ == 6
+#if __GNUC__ == 4 && __GNUC_MINOR__ < 8
+#error "Currently we need g++ 4.8 or higher to fully support c++11 features"
 #define override
 #define final
 #endif

diff --git a/src/common/object_pool.h b/src/common/object_pool.h
@@ -46,10 +46,15 @@ class ObjectPool {
    * \brief Internal structure to hold pointers.
    */
   struct LinkedList {
+#defined(_MSC_VER))
+    T t;
+    LinkedList* next{nullptr};
+#else
     union {
-      LinkedList* next{nullptr};
       T t;
+      LinkedList* next{nullptr};
     };
+#endif
   };
   /*!
    * \brief Page size of allocation.