Merge remote-tracking branch 'origin/linux64_ingopcs2' into windows_ingopcs

# Conflicts:
#	opcua-client/.cproject
#	opcua/lib/StandardDataTypes/OpcUa_IPCS_Guid.h
#	s2opc_stack/configuration/sopc_ieee_check.c
#	s2opc_stack/configuration/sopc_toolkit_build_info.h_
#	s2opc_stack/include_linux/crypto_provider_lib.h
#	s2opc_stack/include_linux/internal_msg.h
#	s2opc_stack/include_linux/p_threads.h
#	s2opc_stack/include_linux/sopc_crypto_decl.h
#	s2opc_stack/include_linux/sopc_sockets_event_mgr.h
#	s2opc_stack/include_linux/sopc_sockets_network_event_mgr.h
#	s2opc_stack/include_linux/sopc_toolkit_build_info.h
#	s2opc_stack/include_linux/util_variant.h
#	s2opc_stack/include_windows/internal_msg.h
#	s2opc_stack/include_windows/sopc_sockets_event_mgr.h

Resources/GENER_JAVA/CTable.java

@@ -5,16 +5,16 @@ public class CTable
 	System.out.println("#include \"OpcUa_IPCS_Table.h\"") ;
 	System.out.println() ;
 
-	printSDT (PData.pSOPCDataSDT,1) ;
-	printSDT (PData.pOpcUaDataSDT,1) ;
-	printSDT (PData.pSpecialSDT,2) ;
-	printCPT (PData.pSOPCDataCPT,1) ;
-	printCPT (PData.pOpcUaDataCPT,1) ;
-	printCPT (PData.pSpecialCPT,2) ;
-	printNMT (PData.pOpcUaDataNMT,1) ;
-	printNAE (PData.pOpcUaDataNAE,1) ;
-	printNAE (PData.pSpecialNAE,2) ;
-	printDAS (PData.pOpcUaDataDAS,1) ;
+	printSDT (PData.pSOPCDataSDT,2) ;
+	printSDT (PData.pOpcUaDataSDT,2) ;
+	printSDT (PData.pSpecialSDT,3) ;
+	printCPT (PData.pSOPCDataCPT,2) ;
+	printCPT (PData.pOpcUaDataCPT,2) ;
+	printCPT (PData.pSpecialCPT,3) ;
+	printNMT (PData.pOpcUaDataNMT,2) ;
+	printNAE (PData.pOpcUaDataNAE,2) ;
+	printNAE (PData.pSpecialNAE,3) ;
+	printDAS (PData.pOpcUaDataDAS,2) ;
 
 	System.out.println() ;
 	System.out.println("namespace opcua {") ;
@@ -37,9 +37,11 @@ public class CTable
 
     private static void printIncls(String dir, String[] t, int k)
     {
-	int borne = t.length-k-1 ;
-	for (int i=0 ; i<borne ; i+=k)
+	for (int i=0 ; i<t.length ; i+=k) {
+	    HTable.printif(t[i+k-1]) ;
 	    System.out.println("#include \"../"+dir+"/OpcUa_IPCS_"+t[i]+".h\"") ;
+	    HTable.printendif(t[i+k-1]) ;
+	}
     }
 
     private static void printDAS(String[] t, int k) { printIncls("DataAccess",t,k) ; }
@@ -50,20 +52,29 @@ public class CTable
 
     private static void printSOPC(String[] t)
     {
-	for (int i=0 ; i<t.length-2 ; i+=1)
+	for (int i=0 ; i<t.length ; i+=2) {
+	    HTable.printif(t[i+1]) ;
 	    print(t[i], "SOPC_"+t[i]) ;	
+	    HTable.printendif(t[i+1]) ;
+	}
     }
 
     private static void printOpcUa(String[] t)
     {
-	for (int i=0 ; i<t.length-2 ; i+=1)
+	for (int i=0 ; i<t.length ; i+=2) {
+	    HTable.printif(t[i+1]) ;
 	    print(t[i], "OpcUa_"+t[i]) ;	
+	    HTable.printendif(t[i+1]) ;
+	}
     }
 
     private static void printTypes(String[] t)
     {
-	for (int i=0 ; i<t.length-3 ; i+=2)
+	for (int i=0 ; i<t.length ; i+=3) {
+	    HTable.printif(t[i+2]) ;
 	    print(t[i], t[i+1]) ;	
+	    HTable.printendif(t[i+2]) ;
+	}
     }
 
     private static void print(String c, String t)

Resources/GENER_JAVA/HTable.java

@@ -29,20 +29,39 @@ public class HTable
 
     private static void printType(String[] t)
     {
-	for (int i=0 ; i<t.length-3 ; i+=2)
+	for (int i=0 ; i<t.length ; i+=3) {
+	    printif(t[i+2]) ;
 	    print(t[i], t[i+1]) ;
+	    printendif(t[i+2]) ;
+	}
     }
 
     private static void printOpcUa(String[] t)
     {
-	for (int i=0 ; i<t.length-2 ; i+=1)
+	for (int i=0 ; i<t.length ; i+=2) {
+	    printif(t[i+1]) ;
 	    print(t[i], "OpcUa_"+t[i]) ;
+	    printendif(t[i+1]) ;
+	}
     }
 
     private static void printSOPC(String[] t)
     {
-	for (int i=0 ; i<t.length-2 ; i+=1)
+	for (int i=0 ; i<t.length ; i+=2) {
+	    printif(t[i+1]) ;
 	    print(t[i], "SOPC_"+t[i]) ;
+	    printendif(t[i+1]) ;
+	}
+    }
+
+    public static void printif(String selector) {
+	if (selector != null)
+	    System.out.println("#if ("+selector+" == 1)") ;
+    }
+
+    public static void printendif(String selector) {
+	if (selector != null)
+	    System.out.println("#endif") ;
     }
 
     private static void print(String c, String t)

Resources/GENER_JAVA/ImplantedServices.java

 public class ImplantedServices
 {
     static final public String[] services = {
-	"GetEndpoints",
-	"ActivateSession",
-	"AddNodes",
-	"AddReferences",
-	"Browse",
-	"Call",
-	"CloseSession",
-	"CreateMonitoredItems",
-	"CreateSession",
-	"CreateSubscription",
-	"DeleteMonitoredItems",
-	"DeleteSubscriptions",
-	"ModifyMonitoredItems",
-	"ModifySubscription",
-	"Publish",
-	"Read",
-	"RegisterNodes",
-	"Republish",
-	"SetMonitoringMode",
-	"SetPublishingMode",
-	"TransferSubscriptions",
-	"TranslateBrowsePathsToNodeIds",
-	"UnregisterNodes",
-	"Write"
+	"GetEndpoints","WITH_DISCOVERY",
+	"ActivateSession",null,
+	"AddNodes","WITH_NODESMNGT",
+	"AddReferences","WITH_NODESMNGT",
+	"Browse","WITH_BROWSE",
+	"Call","WITH_CALL",
+	"CloseSession",null,
+	"CreateMonitoredItems","WITH_SUBSCRIPTION",
+	"CreateSession",null,
+	"CreateSubscription","WITH_SUBSCRIPTION",
+	"DeleteMonitoredItems","WITH_SUBSCRIPTION",
+	"DeleteSubscriptions","WITH_SUBSCRIPTION",
+	"ModifyMonitoredItems","WITH_SUBSCRIPTION",
+	"ModifySubscription","WITH_SUBSCRIPTION",
+	"Publish","WITH_SUBSCRIPTION",
+	"Read","WITH_READ",
+	"RegisterNodes","WITH_REGISTER_UNREGISTER_NODES",
+	"Republish","WITH_SUBSCRIPTION",
+	"SetMonitoringMode","WITH_SUBSCRIPTION",
+	"SetPublishingMode","WITH_SUBSCRIPTION",
+	"TransferSubscriptions","WITH_SUBSCRIPTION",
+	"TranslateBrowsePathsToNodeIds","WITH_TRANSLATE_BROWSEPATHS_TO_NODEIDS",
+	"UnregisterNodes","WITH_REGISTER_UNREGISTER_NODES",
+	"Write","WITH_WRITE"
     } ;
 }

Resources/GENER_JAVA/InitServerApi.java

@@ -12,18 +12,23 @@ public class InitServerApi
 	System.out.println() ;
 	System.out.println("extern \"C\" {") ;
 	System.out.println() ;
-	for (String service : services) {
+	for (int i = 0; i < services.length ; i+= 2 ) {
+	    HTable.printif(services[i+1]) ;
 	    System.out.println("extern") ;
 	    System.out.println("#ifdef _WIN32") ;
 	    System.out.println("__declspec( dllimport )") ;
 	    System.out.println("#endif") ;
-	    System.out.println("SOPC_ServiceType OpcUa_"+service+"_ServiceType ;") ;
+	    System.out.println("SOPC_ServiceType OpcUa_"+services[i]+"_ServiceType ;") ;
+	    HTable.printendif(services[i+1]) ;
 	}
 	System.out.println() ;
 	System.out.println("void initServerApi()") ;
 	System.out.println("{") ;
-	for (String service : services)
-	    System.out.println("   OpcUa_"+service+"_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_"+service+" ;") ;
+	for (int i = 0; i < services.length ; i+= 2 ) {
+	    HTable.printif(services[i+1]) ;
+	    System.out.println("   OpcUa_"+services[i]+"_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_"+services[i]+" ;") ;
+	    HTable.printendif(services[i+1]) ;
+	}
 	System.out.println("}") ;
 	System.out.println() ;
 	System.out.println("} // extern \"C\"") ;

Resources/GENER_JAVA/Makefile

 .PHONY: a h c s sa
 
-a : h c s sa
+a : h c
 
 h :
-	javac HTable.java
+	javac HTable.java PData.java
 	java HTable > OpcUa_GENR_Tables.h
 	cp OpcUa_GENR_Tables.h ~/Desktop/opc-rosa/opcua/lib/Utils/
 
 c :
-	javac CTable.java
+	javac CTable.java PData.java HTable.java
 	java CTable > OpcUa_GENR_Tables.cpp
 	cp OpcUa_GENR_Tables.cpp ~/Desktop/opc-rosa/opcua/lib/Utils/
 
+# PLus ncessaire
+
 s :
-	javac InitServerApi.java
+	javac InitServerApi.java  HTable.java
 	java InitServerApi > OpcUa_GENR_InitServerApi.h
 	cp OpcUa_GENR_InitServerApi.h ~/Desktop/opc-rosa/opcua-server/server/
 

Resources/GENER_JAVA/OpcUa_GENR_InitServerApi.h

@@ -5,154 +5,238 @@
 
 extern "C" {
 
-extern 
+#if (WITH_DISCOVERY == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_GetEndpoints_ServiceType ;
-extern 
+#endif
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_ActivateSession_ServiceType ;
-extern 
+#if (WITH_NODESMNGT == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_AddNodes_ServiceType ;
-extern 
+#endif
+#if (WITH_NODESMNGT == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_AddReferences_ServiceType ;
-extern 
+#endif
+#if (WITH_BROWSE == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_Browse_ServiceType ;
-extern 
+#endif
+#if (WITH_CALL == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_Call_ServiceType ;
-extern 
+#endif
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_CloseSession_ServiceType ;
-extern 
+#if (WITH_SUBSCRIPTION == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_CreateMonitoredItems_ServiceType ;
-extern 
+#endif
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_CreateSession_ServiceType ;
-extern 
+#if (WITH_SUBSCRIPTION == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_CreateSubscription_ServiceType ;
-extern 
+#endif
+#if (WITH_SUBSCRIPTION == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_DeleteMonitoredItems_ServiceType ;
-extern 
+#endif
+#if (WITH_SUBSCRIPTION == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_DeleteSubscriptions_ServiceType ;
-extern 
+#endif
+#if (WITH_SUBSCRIPTION == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_ModifyMonitoredItems_ServiceType ;
-extern 
+#endif
+#if (WITH_SUBSCRIPTION == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_ModifySubscription_ServiceType ;
-extern 
+#endif
+#if (WITH_SUBSCRIPTION == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_Publish_ServiceType ;
-extern 
+#endif
+#if (WITH_READ == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_Read_ServiceType ;
-extern 
+#endif
+#if (WITH_REGISTER_UNREGISTER_NODES == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_RegisterNodes_ServiceType ;
-extern 
+#endif
+#if (WITH_SUBSCRIPTION == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_Republish_ServiceType ;
-extern 
+#endif
+#if (WITH_SUBSCRIPTION == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_SetMonitoringMode_ServiceType ;
-extern 
+#endif
+#if (WITH_SUBSCRIPTION == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_SetPublishingMode_ServiceType ;
-extern 
+#endif
+#if (WITH_SUBSCRIPTION == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_TransferSubscriptions_ServiceType ;
-extern 
+#endif
+#if (WITH_TRANSLATE_BROWSEPATHS_TO_NODEIDS == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_TranslateBrowsePathsToNodeIds_ServiceType ;
-extern 
+#endif
+#if (WITH_REGISTER_UNREGISTER_NODES == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_UnregisterNodes_ServiceType ;
-extern 
+#endif
+#if (WITH_WRITE == 1)
+extern
 #ifdef _WIN32
 __declspec( dllimport )
 #endif
 SOPC_ServiceType OpcUa_Write_ServiceType ;
+#endif
 
 void initServerApi()
 {
+#if (WITH_DISCOVERY == 1)
    OpcUa_GetEndpoints_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_GetEndpoints ;
+#endif
    OpcUa_ActivateSession_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_ActivateSession ;
+#if (WITH_NODESMNGT == 1)
    OpcUa_AddNodes_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_AddNodes ;
+#endif
+#if (WITH_NODESMNGT == 1)
    OpcUa_AddReferences_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_AddReferences ;
+#endif
+#if (WITH_BROWSE == 1)
    OpcUa_Browse_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_Browse ;
+#endif
+#if (WITH_CALL == 1)
    OpcUa_Call_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_Call ;
+#endif
    OpcUa_CloseSession_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_CloseSession ;
+#if (WITH_SUBSCRIPTION == 1)
    OpcUa_CreateMonitoredItems_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_CreateMonitoredItems ;
+#endif
    OpcUa_CreateSession_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_CreateSession ;
+#if (WITH_SUBSCRIPTION == 1)
    OpcUa_CreateSubscription_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_CreateSubscription ;
+#endif
+#if (WITH_SUBSCRIPTION == 1)
    OpcUa_DeleteMonitoredItems_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_DeleteMonitoredItems ;
+#endif
+#if (WITH_SUBSCRIPTION == 1)
    OpcUa_DeleteSubscriptions_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_DeleteSubscriptions ;
+#endif
+#if (WITH_SUBSCRIPTION == 1)
    OpcUa_ModifyMonitoredItems_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_ModifyMonitoredItems ;
+#endif
+#if (WITH_SUBSCRIPTION == 1)
    OpcUa_ModifySubscription_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_ModifySubscription ;
+#endif
+#if (WITH_SUBSCRIPTION == 1)
    OpcUa_Publish_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_Publish ;
+#endif
+#if (WITH_READ == 1)
    OpcUa_Read_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_Read ;
+#endif
+#if (WITH_REGISTER_UNREGISTER_NODES == 1)
    OpcUa_RegisterNodes_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_RegisterNodes ;
+#endif
+#if (WITH_SUBSCRIPTION == 1)
    OpcUa_Republish_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_Republish ;
+#endif
+#if (WITH_SUBSCRIPTION == 1)
    OpcUa_SetMonitoringMode_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_SetMonitoringMode ;
+#endif
+#if (WITH_SUBSCRIPTION == 1)
    OpcUa_SetPublishingMode_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_SetPublishingMode ;
+#endif
+#if (WITH_SUBSCRIPTION == 1)
    OpcUa_TransferSubscriptions_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_TransferSubscriptions ;
+#endif
+#if (WITH_TRANSLATE_BROWSEPATHS_TO_NODEIDS == 1)
    OpcUa_TranslateBrowsePathsToNodeIds_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_TranslateBrowsePathsToNodeIds ;
+#endif
+#if (WITH_REGISTER_UNREGISTER_NODES == 1)
    OpcUa_UnregisterNodes_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_UnregisterNodes ;
+#endif
+#if (WITH_WRITE == 1)
    OpcUa_Write_ServiceType.InvokeService = (SOPC_InvokeService *)OpcUa_ServerApi_Write ;
+#endif
 }
 
-} // "C"
+} // extern "C"
 #endif // _INITSERVERAPI_H

Resources/GENER_JAVA/OpcUa_GENR_Tables.cpp

@@ -29,34 +29,89 @@
 #include "../CommonParametersTypes/OpcUa_IPCS_EndpointDescription.h"
 #include "../CommonParametersTypes/OpcUa_IPCS_SignedSoftwareCertificate.h"
 #include "../CommonParametersTypes/OpcUa_IPCS_UserTokenPolicy.h"
+#if (WITH_READ == 1)
 #include "../CommonParametersTypes/OpcUa_IPCS_ReadValueId.h"
+#endif
+#if (WITH_WRITE == 1)
 #include "../CommonParametersTypes/OpcUa_IPCS_WriteValue.h"
+#endif
+#if (WITH_CALL == 1)
 #include "../CommonParametersTypes/OpcUa_IPCS_CallMethodRequest.h"
+#endif
+#if (WITH_CALL == 1)
 #include "../CommonParametersTypes/OpcUa_IPCS_CallMethodResult.h"
+#endif
+#if (WITH_BROWSE == 1)
 #include "../CommonParametersTypes/OpcUa_IPCS_BrowseDescription.h"
+#endif
+#if (WITH_BROWSE == 1)
 #include "../CommonParametersTypes/OpcUa_IPCS_BrowseResult.h"
+#endif
+#if (WITH_BROWSE == 1)
 #include "../CommonParametersTypes/OpcUa_IPCS_ReferenceDescription.h"
+#endif
+#if (WITH_TRANSLATE_BROWSEPATHS_TO_NODEIDS == 1)
 #include "../CommonParametersTypes/OpcUa_IPCS_BrowsePath.h"
+#endif
+#if (WITH_TRANSLATE_BROWSEPATHS_TO_NODEIDS == 1)
 #include "../CommonParametersTypes/OpcUa_IPCS_RelativePathElement.h"
+#endif
+#if (WITH_TRANSLATE_BROWSEPATHS_TO_NODEIDS == 1)
 #include "../CommonParametersTypes/OpcUa_IPCS_BrowsePathResult.h"
+#endif
+#if (WITH_TRANSLATE_BROWSEPATHS_TO_NODEIDS == 1)
 #include "../CommonParametersTypes/OpcUa_IPCS_BrowsePathTarget.h"
+#endif
+#if (WITH_QUERY == 1)
 #include "../CommonParametersTypes/OpcUa_IPCS_ContentFilterElement.h"
+#endif
+#if (WITH_QUERY == 1)
 #include "../CommonParametersTypes/OpcUa_IPCS_QueryDataDescription.h"
+#endif
+#if (WITH_DISCOVERY == 1)
+#include "../CommonParametersTypes/OpcUa_IPCS_ApplicationDescription.h"
+#endif
+#if (WITH_QUERY == 1)
 #include "../CommonParametersTypes/OpcUa_IPCS_FilterOperand.h"
+#endif
 #include "../CommonParametersTypes/OpcUa_IPCS_IntegerId.h"
 #include "../CommonParametersTypes/OpcUa_IPCS_Counter.h"
+#if (WITH_NODEMNGT == 1)
 #include "../NodeManagement/OpcUa_IPCS_AddNodesItem.h"
+#endif
+#if (WITH_NODEMNGT == 1)
 #include "../NodeManagement/OpcUa_IPCS_AddNodesResult.h"
+#endif
+#if (WITH_NODEMNGT == 1)
 #include "../NodeManagement/OpcUa_IPCS_AddReferencesItem.h"
+#endif
+#if (WITH_SUBSCRIPTION == 1)
 #include "../NotificationsAndEvents/OpcUa_IPCS_MonitoredItemCreateRequest.h"
+#endif
+#if (WITH_SUBSCRIPTION == 1)
 #include "../NotificationsAndEvents/OpcUa_IPCS_MonitoredItemCreateResult.h"
+#endif
+#if (WITH_SUBSCRIPTION == 1)
 #include "../NotificationsAndEvents/OpcUa_IPCS_MonitoredItemModifyRequest.h"
+#endif
+#if (WITH_SUBSCRIPTION == 1)
 #include "../NotificationsAndEvents/OpcUa_IPCS_MonitoredItemModifyResult.h"
+#endif
+#if (WITH_SUBSCRIPTION == 1)
 #include "../NotificationsAndEvents/OpcUa_IPCS_TransferResult.h"
+#endif
+#if (WITH_SUBSCRIPTION == 1)
 #include "../NotificationsAndEvents/OpcUa_IPCS_SubscriptionAcknowledgement.h"
+#endif
+#if (WITH_SUBSCRIPTION == 1)
 #include "../NotificationsAndEvents/OpcUa_IPCS_MonitoredItemNotification.h"
+#endif
+#if (WITH_SUBSCRIPTION == 1)
 #include "../NotificationsAndEvents/OpcUa_IPCS_EventFieldList.h"
+#endif
+#if (WITH_SUBSCRIPTION == 1)
 #include "../NotificationsAndEvents/OpcUa_IPCS_NotificationData.h"
+#endif
 #include "../DataAccess/OpcUa_IPCS_Range.h"
 #include "../DataAccess/OpcUa_IPCS_EUInformation.h"
 
@@ -510,6 +565,7 @@ MYDLL TableStatusCode * TableStatusCode::fromCtoCpp(SOPC_StatusCode * pStatus, i
     return NULL ;
 }
 
+#if (WITH_NODEMNGT == 1)
 
 MYDLL TableAddNodesItem * TableAddNodesItem::getTable(int n) const { return new TableAddNodesItem(n) ; }
 
@@ -538,6 +594,8 @@ MYDLL TableAddNodesItem * TableAddNodesItem::fromCtoCpp(SOPC_StatusCode * pStatu
     return NULL ;
 }
 
+#endif
+#if (WITH_NODEMNGT == 1)
 
 MYDLL TableAddNodesResult * TableAddNodesResult::getTable(int n) const { return new TableAddNodesResult(n) ; }
 
@@ -566,6 +624,8 @@ MYDLL TableAddNodesResult * TableAddNodesResult::fromCtoCpp(SOPC_StatusCode * pS
     return NULL ;
 }
 
+#endif
+#if (WITH_NODEMNGT == 1)
 
 MYDLL TableAddReferencesItem * TableAddReferencesItem::getTable(int n) const { return new TableAddReferencesItem(n) ; }
 
@@ -594,6 +654,8 @@ MYDLL TableAddReferencesItem * TableAddReferencesItem::fromCtoCpp(SOPC_StatusCod