erpcgen: Add namespace and remove typedefs in C++ common header

- Constant variable declarations are not namespaced
PhilippHaefele · Apr 4, 2024 · 7ae0969 · 7ae0969
1 parent f9af0f6
commit 7ae0969
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/erpcgen/src/templates/c_common_header.template b/erpcgen/src/templates/c_common_header.template
@@ -40,6 +40,9 @@ extern "C"
 
 #if !defined(ERPC_TYPE_DEFINITIONS{$scopeNamePrefix}{$scopeNameC})
 #define ERPC_TYPE_DEFINITIONS{$scopeNamePrefix}{$scopeNameC}
+{% if not cCommonHeaderFile %}
+{$fillNamespaceBegin()}
+{% endif -- not cCommonHeaderFile %}
 {% if not empty(enums) %}
 
 // Enumerators data types declarations
@@ -54,6 +57,7 @@ extern "C"
 }{$addIndent(" ", enum.name)};{$enum.ilComment}{$loop.addNewLineIfNotLast}
 {%  endfor -- enums %}
 {% endif -- enums %}
+{% if cCommonHeaderFile %}
 {% if not empty(aliases) %}
 
 // Aliases data types declarations
@@ -71,6 +75,7 @@ typedef {$alias.typenameName};{$alias.ilComment}
 {%   endif -- alias.typenameName %}
 {%  endfor -- aliases %}
 {% endif -- aliases %}
+{% endif -- cCommonHeaderFile %}
 {% if nonExternalStructUnion %}
 
 // Structures/unions data types declarations
@@ -97,6 +102,11 @@ union {$us.name}
 {%  endfor -- symbols %}
 
 {% endif -- nonExternalStruct || nonExternalUnion %}
+
+{% if not cCommonHeaderFile %}
+{$fillNamespaceEnd()}
+{% endif -- not cCommonHeaderFile %}
+
 {% if not empty(consts) %}
 
 // Constant variable declarations