From: Ebersold Andre <aebersol@md2p7zxc.ad001.siemens.net>
Date: Tue, 17 May 2022 09:12:12 +0000 (+0200)
Subject: Fixed some build issues with wsl ubuntu 18
X-Git-Url: https://git.ebersold.fr/?a=commitdiff_plain;h=3766b58870a3eee132616400fc54674b9341c843;p=wsproxy.git

Fixed some build issues with wsl ubuntu 18
---

diff --git a/utils b/utils
index 5f6e913..a65bd62 160000
--- a/utils
+++ b/utils
@@ -1 +1 @@
-Subproject commit 5f6e9134ab67b61537fc0bf557842221001f76b1
+Subproject commit a65bd6271ccece2754c8f4937fc3a43f759fc5d7
diff --git a/wsproxy/CMakeLists.txt b/wsproxy/CMakeLists.txt
index ca1adb1..06dcde3 100644
--- a/wsproxy/CMakeLists.txt
+++ b/wsproxy/CMakeLists.txt
@@ -28,7 +28,7 @@ SET(PROFILE
 ADD_CUSTOM_COMMAND(
     SOURCE ${PROFILE}
     COMMAND java 
-    ARGS -jar ${SAXON} -s ${PROFILE} -xsl:${XSD2CPP}
+    ARGS -jar ${SAXON} -s:${PROFILE} -xsl:${XSD2CPP}
     rootdir="./parser/"
     target="release" root-element="CONFIGURATION"
     shared-ptr="aeb" incdir="/../include"
diff --git a/wsproxy/plugins/CMakeLists.txt b/wsproxy/plugins/CMakeLists.txt
index 562478b..c8143ff 100644
--- a/wsproxy/plugins/CMakeLists.txt
+++ b/wsproxy/plugins/CMakeLists.txt
@@ -4,6 +4,6 @@ INCLUDE_DIRECTORIES(".")
 
 ADD_LIBRARY(plugin_default SHARED plugin_default.cpp)
 SET_TARGET_PROPERTIES(plugin_default PROPERTIES COMPILE_FLAGS -fPIC)
-SET_TARGET_PROPERTIES(plugin_default PROPERTIES LINK_FLAGS -Wl)
+SET_TARGET_PROPERTIES(plugin_default PROPERTIES LINK_FLAGS -W)
 ADD_LIBRARY(plugin_log     SHARED plugin_log.cpp)
 SET_TARGET_PROPERTIES(plugin_log PROPERTIES COMPILE_FLAGS -fPIC)
diff --git a/wsproxy/ws_allocator.h b/wsproxy/ws_allocator.h
index 4720f7f..c7c26d9 100644
--- a/wsproxy/ws_allocator.h
+++ b/wsproxy/ws_allocator.h
@@ -64,5 +64,9 @@ template <typename T1,std::size_t S1,int A1,typename T2,std::size_t S2,int A2>
 inline bool operator ==(ws_allocator<T1,S1,A1> const &,ws_allocator<T2,S2,A2> const &) {
   return true;
 }
+template <typename T1,std::size_t S1,int A1,typename T2,std::size_t S2,int A2>
+inline bool operator !=(ws_allocator<T1,S1,A1> const &_lh,ws_allocator<T2,S2,A2> const &_rh) {
+  return ! (_lh == _rh);
+}
 
 #endif /*WS_ALLOCATOR_H*/