Переглянути джерело

do not include namespace0 with the generated types everywhere

Julius Pfrommer 10 роки тому
батько
коміт
c5d917c049

+ 2 - 1
src/server/ua_server_binary.c

@@ -1,8 +1,9 @@
 #include "ua_server.h"
 #include "ua_services.h"
 #include "ua_statuscodes.h"
-#include "util/ua_util.h"
+#include "ua_namespace_0.h"
 #include "ua_securechannel_manager.h"
+#include "util/ua_util.h"
 
 static void processHello(UA_Connection *connection, const UA_ByteString *msg,
                          UA_UInt32 *pos) {

+ 1 - 0
src/server/ua_services_attribute.c

@@ -1,6 +1,7 @@
 #include "ua_services.h"
 #include "ua_statuscodes.h"
 #include "ua_nodestore.h"
+#include "ua_namespace_0.h"
 #include "util/ua_util.h"
 
 enum UA_AttributeId {

+ 1 - 0
src/server/ua_services_discovery.c

@@ -1,4 +1,5 @@
 #include "ua_services.h"
+#include "ua_namespace_0.h"
 
 UA_Int32 Service_GetEndpoints(UA_Server                    *server,
                               const UA_GetEndpointsRequest *request,

+ 1 - 0
src/server/ua_services_monitoreditems.c

@@ -1,4 +1,5 @@
 #include "ua_services.h"
+#include "ua_namespace_0.h"
 #include "ua_statuscodes.h"
 
 //#if 0

+ 1 - 0
src/server/ua_services_view.c

@@ -1,6 +1,7 @@
 #include "ua_services.h"
 #include "ua_statuscodes.h"
 #include "ua_nodestore.h"
+#include "ua_namespace_0.h"
 #include "util/ua_util.h"
 
 UA_Int32 Service_Browse_getReferenceDescription(UA_NodeStore *ns, UA_ReferenceNode *reference,

+ 1 - 1
tools/generate_builtin.py

@@ -295,7 +295,6 @@ printh('''/**
 #include "ua_types_encoding_binary.h"''')
 if args.with_xml:
 	printh('#include "ua_types_encoding_xml.h"')
-printh('#include "ua_namespace_0.h"')
 if args.additional_includes:
     for incl in args.additional_includes.split(","):
         printh("#include \"" + incl + "\"")
@@ -311,6 +310,7 @@ printc('''/**
  */
  
 #include "''' + args.outfile.split("/")[-1] + '''.h"
+#include "ua_namespace_0.h"
 #include "util/ua_util.h"\n''')
 
 # types for which we create a vector type