added back fsfw namespace

src/fsfw/devicehandlers/DeviceHandlerBase.h

@@ -1062,7 +1062,8 @@ class DeviceHandlerBase : public DeviceHandlerIF,
   /**
    * Same as triggerEvent, but for forwarding if object is used as proxy.
    */
-  virtual void forwardEvent(Event event, uint32_t parameter1 = 0, uint32_t parameter2 = 0) const override;
+  virtual void forwardEvent(Event event, uint32_t parameter1 = 0,
+                            uint32_t parameter2 = 0) const override;
 
   /**
    * Checks if current mode is transitional mode.

src/fsfw/objectmanager/SystemObject.h

@@ -50,7 +50,8 @@ class SystemObject : public SystemObjectIF {
   virtual ReturnValue_t initialize() override;
   virtual ReturnValue_t checkObjectConnections() override;
 
-  virtual void forwardEvent(Event event, uint32_t parameter1 = 0, uint32_t parameter2 = 0) const override;
+  virtual void forwardEvent(Event event, uint32_t parameter1 = 0,
+                            uint32_t parameter2 = 0) const override;
 };
 
 #endif /* FSFW_OBJECTMANAGER_SYSTEMOBJECT_H_ */

src/fsfw/osal/common/UdpTmTcBridge.h

@@ -29,8 +29,8 @@ class UdpTmTcBridge : public TmTcBridge, public TcpIpBase {
   /* The ports chosen here should not be used by any other process. */
   static const std::string DEFAULT_SERVER_PORT;
 
-  UdpTmTcBridge(object_id_t objectId, object_id_t tcDestination, const std::string& udpServerPort = "",
+  UdpTmTcBridge(object_id_t objectId, object_id_t tcDestination,
-                object_id_t tmStoreId = objects::TM_STORE,
+                const std::string& udpServerPort = "", object_id_t tmStoreId = objects::TM_STORE,
                 object_id_t tcStoreId = objects::TC_STORE);
   ~UdpTmTcBridge() override;
 

src/fsfw/version.cpp

@@ -12,19 +12,21 @@
 #undef minor
 #endif
 
-const Version fsfw::FSFW_VERSION = {FSFW_VERSION_MAJOR, FSFW_VERSION_MINOR, FSFW_VERSION_REVISION,
+const fsfw::Version fsfw::FSFW_VERSION = {FSFW_VERSION_MAJOR, FSFW_VERSION_MINOR,
-                                    FSFW_VERSION_CST_GIT_SHA1};
+                                          FSFW_VERSION_REVISION, FSFW_VERSION_CST_GIT_SHA1};
 
-Version::Version(int major, int minor, int revision, const char* addInfo)
+fsfw::Version::Version(int major, int minor, int revision, const char* addInfo)
     : major(major), minor(minor), revision(revision), addInfo(addInfo) {}
 
-void Version::getVersion(char* str, size_t maxLen) const {
+void fsfw::Version::getVersion(char* str, size_t maxLen) const {
   size_t len = snprintf(str, maxLen, "%d.%d.%d", major, minor, revision);
   if (addInfo != nullptr) {
     snprintf(str + len, maxLen - len, "-%s", addInfo);
   }
 }
 
+namespace fsfw {
+
 #if FSFW_CPP_OSTREAM_ENABLED == 1
 std::ostream& operator<<(std::ostream& os, const Version& v) {
   os << v.major << "." << v.minor << "." << v.revision;
@@ -34,3 +36,5 @@ std::ostream& operator<<(std::ostream& os, const Version& v) {
   return os;
 }
 #endif
+
+}  // namespace fsfw

src/fsfw/version.h

@@ -8,6 +8,8 @@
 #endif
 #include <cstdint>
 
+namespace fsfw {
+
 class Version {
  public:
   Version(int major, int minor, int revision, const char* addInfo = nullptr);
@@ -55,8 +57,6 @@ class Version {
   void getVersion(char* str, size_t maxLen) const;
 };
 
-namespace fsfw {
-
 extern const Version FSFW_VERSION;
 
 }  // namespace fsfw