Added a few missing changes for the Chaiscript to C++ conversion.

Also: depending on ot_me_switch.hpp setting, OT_ME.cpp will no longer load ot_commands.ot and ot_made_easy.ot when running in C++ mode. It will add direct references to the C++ equivalents of the Chaiscript functions to the Chaiscript interpreter instead.
FellowTraveler · Apr 8, 2014 · bd6939f · bd6939f
1 parent c1721a2
commit bd6939f
Show file tree

Hide file tree

Showing 37 changed files with 1,715 additions and 2,922 deletions.
diff --git a/include/otapi/OTAPI.hpp b/include/otapi/OTAPI.hpp
@@ -180,7 +180,7 @@ class OTAPI_Wrap
     EXPORT static OTAPI_Exec * SetExecutor(OTAPI_Exec * exec);
 
     EXPORT static OTAPI_Exec * Exec();
-    EXPORT static OTAPI_Exec * It() { return Exec(); }
+    EXPORT static OTAPI_Exec * It();
 
     EXPORT static OT_API     *  OTAPI();
 	// --------------------------------------------------------------------

diff --git a/include/otapi/OTClient.hpp b/include/otapi/OTClient.hpp
@@ -137,22 +137,8 @@
 
 #include "OTServerConnection.hpp"
 
-#ifndef IMPORT
-#define IMPORT
-#ifndef IMPORT_SET
-#define IMPORT_SET
-#endif
-#endif
-
 #include "OTMessageBuffer.hpp"
 
-#ifdef IMPORT_SET
-#undef IMPORT_SET
-#ifdef IMPORT
-#undef IMPORT
-#include "OTCommon.hpp"
-#endif
-#endif
 
 struct TransportCallback;
 

diff --git a/include/otapi/OTServerConnection.hpp b/include/otapi/OTServerConnection.hpp
@@ -137,24 +137,9 @@
 
 #include "OTCommon.hpp"
 
-#ifndef IMPORT
-#define IMPORT
-#ifndef IMPORT_SET
-#define IMPORT_SET
-#endif
-#endif
-
 #include "OTMessageBuffer.hpp"
 #include "OTServerContract.hpp"
 
-#ifdef IMPORT_SET
-#undef IMPORT_SET
-#ifdef IMPORT
-#undef IMPORT
-#include "OTCommon.hpp"
-#endif
-#endif
-
 
 struct TransportCallback;