reflect source codes of Node.JS client(0.8.0)

knonomura · knonomura · commit ed5bec42e130 · 2019-03-14T19:36:16.000+09:00
diff --git a/src/StoreFactory.h b/src/StoreFactory.h
@@ -18,12 +18,13 @@
 #define _STORE_FACTORY_H_
 #define CLIENT_VERSION "GridDB Python Client 0.8.0"
 
-#include "gridstore.h"
-#include "Store.h"
-
 #include <map>
 #include <string>
 
+#include "gridstore.h"
+#include "Store.h"
+#include "GSException.h"
+
 using namespace std;
 
 namespace griddb {
@@ -33,12 +34,12 @@ namespace griddb {
  * This class is implemented as singleton.
  */
 class StoreFactory {
-
-    GSGridStoreFactory* mFactory;
+    private:
+        GSGridStoreFactory* mFactory;
 
     public:
         ~StoreFactory();
-        void close(GSBool allRelated);
+        void close(GSBool allRelated = GS_FALSE);
         static StoreFactory* get_instance();
         Store* get_store(const char* host=NULL, int32_t port=0, const char* cluster_name=NULL,
                 const char* database=NULL, const char* username=NULL, const char* password=NULL,
diff --git a/src/griddb.i b/src/griddb.i
@@ -82,8 +82,17 @@
 #include "RowKeyPredicate.h"
 #include "Store.h"
 #include "StoreFactory.h"
+%}
+#if !defined(SWIGJAVASCRIPT)
+%{
 #include "TimestampUtils.h"
 %}
+#endif
+#if defined(SWIGJAVASCRIPT) || defined(SWIGPHP)
+%{
+#include "EnumValue.h"
+%}
+#endif
 
 #if defined(SWIGPYTHON)
 %shared_ptr(griddb::Resource)
@@ -115,4 +124,9 @@
 %include "RowKeyPredicate.h"
 %include "Store.h"
 %include "StoreFactory.h"
+#if !defined(SWIGJAVASCRIPT)
 %include "TimestampUtils.h"
+#endif
+#if defined(SWIGJAVASCRIPT) || defined(SWIGPHP)
+%include "EnumValue.h"
+#endif
