Fixed compiler errors

exasol · Oct 15, 2024 · ef099fd · ef099fd
1 parent a846279
commit ef099fd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/exaudfclient/base/javacontainer/javacontainer_builder.cc b/exaudfclient/base/javacontainer/javacontainer_builder.cc
@@ -1,30 +1,28 @@
 #include "base/javacontainer/javacontainer_builder.h"
 #include "base/javacontainer/script_options/parser_ctpg.h"
 #include "base/javacontainer/script_options/parser_legacy.h"
-#include "base/javacontainer/javacontainer.h"
 #include "base/swig_factory/swig_factory_impl.h"
 
 #ifdef ENABLE_JAVA_VM
 
 namespace SWIGVMContainers {
 
 JavaContainerBuilder::JavaContainerBuilder()
-: m_parser() {}
+: m_useCtpgParser(false) {}
 
 JavaContainerBuilder& JavaContainerBuilder::useCtpgParser(const bool useCtpgParser) {
-    if (useCtpgParser) {
-        m_parser = std::make_unique<JavaScriptOptions::ScriptOptionLinesParserCTPG>(std::make_unique<SwigFactoryImpl>());
-    }
+    m_useCtpgParser = useCtpgParser;
     return *this;
 }
 
 JavaVMach* JavaContainerBuilder::build() {
-    if (m_parser) {
-        return new JavaVMach(false, std::move(m_parser));
+    std::unique_ptr<JavaScriptOptions::ScriptOptionsParser> parser;
+    if (m_useCtpgParser) {
+        parser = std::make_unique<JavaScriptOptions::ScriptOptionLinesParserCTPG>(std::make_unique<SwigFactoryImpl>());
     } else {
-        m_parser = std::make_unique<JavaScriptOptions::ScriptOptionLinesParserLegacy>(std::make_unique<SwigFactoryImpl>());
-        return new JavaVMach(false, std::move(m_parser));
+        parser = std::make_unique<JavaScriptOptions::ScriptOptionLinesParserLegacy>(std::make_unique<SwigFactoryImpl>());
     }
+    return new JavaVMach(false, std::move(parser));
 }
 
 

diff --git a/exaudfclient/base/javacontainer/javacontainer_builder.h b/exaudfclient/base/javacontainer/javacontainer_builder.h
@@ -2,13 +2,12 @@
 #define JAVACONTAINER_BUILDER_H
 
 #include <memory>
+#include "base/javacontainer/javacontainer.h"
 
 #ifdef ENABLE_JAVA_VM
 
 namespace SWIGVMContainers {
 
-class JavaVMach;
-
 namespace JavaScriptOptions {
 
 struct ScriptOptionsParser;
@@ -24,7 +23,7 @@ class JavaContainerBuilder {
         JavaVMach* build();
 
     private:
-        std::unique_ptr<JavaScriptOptions::ScriptOptionsParser> m_parser;
+        bool m_useCtpgParser;
 };
 
 } //namespace SWIGVMContainers

diff --git a/exaudfclient/exaudfclient.cc b/exaudfclient/exaudfclient.cc
@@ -49,8 +49,6 @@
 #include "protegrityclient.h"
 #endif
 
-#include "base/swig_factory/swig_factory_impl.h"
-
 using namespace std;
 using namespace SWIGVMContainers;
 
@@ -140,7 +138,6 @@ int main(int argc, char **argv) {
     ::setlocale(LC_ALL, "en_US.utf8");
 
     std::function<SWIGVMContainers::SWIGVM*()>vmMaker=[](){return nullptr;}; // the initial vm maker returns NULL
-    SwigFactoryImpl swigFactory;
 #ifdef UDF_PLUGIN_CLIENT
     vmMaker = [](){return new SWIGVMContainers::Protegrity(false);};
 #else
@@ -163,7 +160,7 @@ int main(int argc, char **argv) {
     } else if (strcmp(argv[2], "lang=java")==0)
     {
 #ifdef ENABLE_JAVA_VM
-        vmMaker = [&](){return SWIGVMContainers::JavaContainerBuilder().build()};
+        vmMaker = [&](){return SWIGVMContainers::JavaContainerBuilder().build();};
 #else
         throw SWIGVM::exception("this exaudfclient has been compilied without Java support");
 #endif