Use fully qualified namespace and name in AC component .hpp (#1935)

nasa · Mar 17, 2023 · 35625eb · 35625eb
1 parent e9c2144
commit 35625eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Autocoders/Python/src/fprime_ac/generators/templates/component/hpp.tmpl b/Autocoders/Python/src/fprime_ac/generators/templates/component/hpp.tmpl
@@ -7,8 +7,8 @@
 //
 // ======================================================================
 
-\#ifndef ${name.upper()}_COMP_HPP_
-\#define ${name.upper()}_COMP_HPP_
+\#ifndef ${namespace.upper().replace("::", "_")}_${name.upper()}_COMP_HPP_
+\#define ${namespace.upper().replace("::", "_")}_${name.upper()}_COMP_HPP_
 
 \#include <FpConfig.hpp>
 \#include <Fw/Port/InputSerializePort.hpp>

diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/ComponentVisitorBase.py b/Autocoders/Python/src/fprime_ac/generators/visitors/ComponentVisitorBase.py
@@ -750,8 +750,10 @@ def initPreamble(self, obj, c):
         c.component_base = c.name() + "ComponentBase"
         if obj.get_namespace() is None:
             c.namespace_list = None
+            c.namespace = ""
         else:
             c.namespace_list = obj.get_namespace().split("::")
+            c.namespace = obj.get_namespace()
         c.user = getuser()
         c.args_string = self.argsString
         c.doxygen_pre_comment = self.doxygenPreComment