浏览代码

HPCC-3162 Fix windows StringArray export and template instantiation

New StringArray methods need to be exported, but that also requires
fixes related to template instantiation order and location.

Signed-off-by: Anthony Fishbeck <Anthony.Fishbeck@lexisnexis.com>
Anthony Fishbeck 12 年之前
父节点
当前提交
c8de29734b
共有 4 个文件被更改,包括 6 次插入5 次删除
  1. 2 0
      system/jlib/jarray.tpp
  2. 1 1
      system/jlib/jkeyboard.hpp
  3. 1 2
      system/jlib/jlib.hpp
  4. 2 2
      system/jlib/jutil.hpp

+ 2 - 0
system/jlib/jarray.tpp

@@ -19,6 +19,8 @@
 #ifndef CCLARRAY_TPP
 #define CCLARRAY_TPP
 
+#include "jarray.hpp"
+
 /************************************************************************
  *                            Master BaseArrays                         *
  ************************************************************************/

+ 1 - 1
system/jlib/jkeyboard.hpp

@@ -20,7 +20,7 @@
 #ifndef JKEYBOARD_HPP
 #define JKEYBOARD_HPP
 
-#include "jutil.hpp"
+#include "jlib.hpp"
 #ifdef _WIN32
 #include <conio.h>
 #else

+ 1 - 2
system/jlib/jlib.hpp

@@ -37,7 +37,7 @@
 #include "modinit.h"
 #include "jiface.hpp"
 #include <assert.h>
-#include "jarray.hpp"
+#include "jarray.tpp"
 
 #define loop            for(;;)
 #define _elements_in(a) (sizeof(a)/sizeof((a)[0]))
@@ -211,7 +211,6 @@ public:
 };
 
 #include "jstring.hpp"
-#include "jarray.tpp"
 #include "jhash.hpp"
 #include "jstream.hpp"
 #include "jutil.hpp"

+ 2 - 2
system/jlib/jutil.hpp

@@ -21,7 +21,7 @@
 
 #include "jexpdef.hpp"
 #include "jstring.hpp"
-#include "jarray.hpp"
+#include "jarray.tpp"
 #include "jbuff.hpp"
 
 //#define NAMEDCOUNTS
@@ -137,7 +137,7 @@ extern jlib_decl void JBASE32_Decode(const char *in,StringBuffer &out);
 extern jlib_decl StringBuffer& encodeUrlUseridPassword(StringBuffer& out, const char* in);
 extern jlib_decl StringBuffer& decodeUrlUseridPassword(StringBuffer& out, const char* in);
 
-class StringArray : public ArrayOf<const char *, const char *>
+class jlib_decl StringArray : public ArrayOf<const char *, const char *>
 {
 public:
     // Appends a list in a string delimited by 'delim'