浏览代码

HPCC-8078 System won't compile under Clang

System is sensitive to include order.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 12 年之前
父节点
当前提交
b23cff487b

+ 1 - 0
dali/base/daclient.hpp

@@ -22,6 +22,7 @@
 #define da_decl __declspec(dllimport)
 #endif
 
+#include "jlib.hpp"
 #include "mpcomm.hpp"
 #include "dasds.hpp"
 

+ 1 - 1
esp/clients/LoggingClient/LogFailSafe.hpp

@@ -34,7 +34,7 @@
 #endif
 
 
-#include "jiface.hpp"
+#include "jlib.hpp"
 #include "jstring.hpp"
 #include "jutil.hpp" // for StringArray
 #include "LogSerializer.hpp"

+ 1 - 1
esp/clients/LoggingClient/LogSerializer.hpp

@@ -22,7 +22,7 @@
 #ifndef _LOGSERIALIZER_HPP__
 #define _LOGSERIALIZER_HPP__
 
-#include "jiface.hpp"
+#include "jlib.hpp"
 #include "jstring.hpp"
 #include "jutil.hpp" // for StringArray
 #include "jmutex.hpp"

+ 1 - 1
esp/smc/SMCLib/TpWrapper.hpp

@@ -34,7 +34,7 @@
 
 
 
-#include "jiface.hpp"
+#include "jlib.hpp"
 #include "mpbase.hpp"
 #include "daclient.hpp"
 #include "dadfs.hpp"

+ 1 - 0
system/jlib/jutil.hpp

@@ -19,6 +19,7 @@
 #ifndef JUTIL_HPP
 #define JUTIL_HPP
 
+#include "jlib.hpp"
 #include "jexpdef.hpp"
 #include "jstring.hpp"
 #include "jarray.tpp"

+ 1 - 1
thorlcr/msort/tsortm.cpp

@@ -28,13 +28,13 @@
 #endif
 #include <limits.h>
 
+#include "jlib.hpp"
 #include <mpbase.hpp>
 #include <mpcomm.hpp>
 #include "thorport.hpp"
 
 #include "jsocket.hpp"
 #include "jthread.hpp"
-#include "jlib.hpp"
 #include "jsort.hpp"
 
 #include "thexception.hpp"

+ 1 - 1
thorlcr/msort/tsorts.cpp

@@ -17,13 +17,13 @@
 
 #include "platform.h"
 #include <limits.h>
+#include "jlib.hpp"
 #include <mpbase.hpp>
 #include <mpcomm.hpp>
 #include "thorport.hpp"
 #include "jsocket.hpp"
 #include "jthread.hpp"
 #include "thormisc.hpp"
-#include "jlib.hpp"
 #include "jisem.hpp"
 #include "jsort.hpp"
 #include "tsorts.hpp"

+ 1 - 0
thorlcr/msort/tsorts1.cpp

@@ -18,6 +18,7 @@
 #include "platform.h"
 #include <limits.h>
 
+#include "jlib.hpp"
 #include "mpbase.hpp"
 #include "mpcomm.hpp"
 #include "thorport.hpp"