diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2010-09-16 02:41:38 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2010-09-16 02:41:38 +0200 |
| commit | 515b99ca7aa343e99adc130ecf88036cb0cb5e57 (patch) | |
| tree | aac108c965def1a7097e872be6be739db1315eae | |
| parent | c13c241a4ab61d018b8d04726e91a7b0397d29bd (diff) | |
Making LuaOCCI using the new OCCI-gateway system.
| -rw-r--r-- | include/LuaOCCI.h | 16 | ||||
| -rw-r--r-- | lib/LuaOCCI.cc | 2 |
2 files changed, 12 insertions, 6 deletions
diff --git a/include/LuaOCCI.h b/include/LuaOCCI.h index af446a6..b271bbb 100644 --- a/include/LuaOCCI.h +++ b/include/LuaOCCI.h @@ -1,22 +1,28 @@ #ifndef __LUAOCCI_H__ #define __LUAOCCI_H__ -#include <occi.h> - #include <Exceptions.h> #include <BLua.h> +#ifdef __MINGW32__ +#include "OCCI-proxy.h" +#define ORAPREFIX occi_proxy +#else +#include <occi.h> +#define ORAPREFIX oracle::occi +#endif + #define DECLARE_OCCI_ENCAP(clname) \ class EncapOCCI_##clname : public Base { \ public: \ - EncapOCCI_##clname(oracle::occi::clname * _o) : o(_o) { } \ + EncapOCCI_##clname(ORAPREFIX::clname * _o) : o(_o) { } \ ~EncapOCCI_##clname() { } \ - oracle::occi::clname * Get() { return o; } \ + ORAPREFIX::clname * Get() { return o; } \ bool disableExceptions; \ String lastError_msg; \ int lastError_code; \ private: \ - oracle::occi::clname * o; \ + ORAPREFIX::clname * o; \ }; \ \ class LuaOCCI_##clname : public LuaObject { \ diff --git a/lib/LuaOCCI.cc b/lib/LuaOCCI.cc index 2397276..6104fc7 100644 --- a/lib/LuaOCCI.cc +++ b/lib/LuaOCCI.cc @@ -3,7 +3,7 @@ #include <LuaHandle.h> #include <LuaOCCI.h> -using namespace oracle::occi; +using namespace ORAPREFIX; static Environment * global_env = 0; |