Removed logging when objects are constructed and destructed

permobergedge · permobergedge · commit 957a072cfcc9 · 2024-12-04T17:57:44.000+01:00
Changed from c-style casting to c++-style.
diff --git a/ElasticFrameProtocol.cpp b/ElasticFrameProtocol.cpp
diff --git a/ElasticFrameProtocol.h b/ElasticFrameProtocol.h
@@ -32,7 +32,6 @@
 #include <vector>
 #include <iostream>
 #include <sstream>
-#include <climits>
 #include <cmath>
 #include <thread>
 #include <map>
@@ -46,7 +45,6 @@
 #include <bitset>
 #include <mutex>
 #include <atomic>
-#include <algorithm>
 #include <deque>
 #include <condition_variable>
 #include <chrono>
@@ -75,8 +73,9 @@ extern "C" {
 #define PRIORITY_P3     0b01100000 // God-mode priority (not implemented)
 #define UNDEFINED_FLAG  0b10000000 // TBD
 
-#define EFP_MAJOR_VERSION 0
-#define EFP_MINOR_VERSION 4
+constexpr uint8_t EFP_MAJOR_VERSION = 0;
+constexpr uint8_t EFP_MINOR_VERSION = 4;
+constexpr uint16_t EFP_VERSION = static_cast<uint16_t>(EFP_MAJOR_VERSION) << 8 | EFP_MINOR_VERSION;
 
 // Bitwise operations are used on members therefore the namespace is wrapping enum instead of 'enum class'
 /// Definition of the data types supported by EFP
@@ -220,7 +219,7 @@ class ElasticFrameProtocolSender {
     virtual ~ElasticFrameProtocolSender();
 
     ///Return the version of the current implementation (Uint16)((8 MSB Major) + (8 LSB Minor))
-    uint16_t getVersion() { return ((uint16_t)EFP_MAJOR_VERSION << 8) | (uint16_t)EFP_MINOR_VERSION; }
+    static uint16_t getVersion() { return EFP_VERSION; }
 
     /**
   * Converts the original data from a vector to EFP packets/fragments
@@ -343,7 +342,7 @@ class ElasticFrameProtocolSender {
 private:
     //Private methods ----- START ------
     // Used by the C - API
-    void sendData(const std::vector<uint8_t> &rSubPacket, uint8_t lStreamID, ElasticFrameProtocolContext* pCTX);
+    void sendData(const std::vector<uint8_t> &rSubPacket, uint8_t lStreamID, ElasticFrameProtocolContext* pCTX) const;
     //Private methods ----- END ------
 
     // Internal lists and variables ----- START ------
@@ -439,8 +438,7 @@ class ElasticFrameProtocolReceiver {
     virtual ~ElasticFrameProtocolReceiver();
 
     ///Return the version of the current implementation
-    uint16_t getVersion() { return ((uint16_t)EFP_MAJOR_VERSION << 8) | (uint16_t)EFP_MINOR_VERSION; }
-
+    static uint16_t getVersion() { return EFP_VERSION; }
     /**
     * Function assembling received fragments from a vector
     *
@@ -593,7 +591,7 @@ class ElasticFrameProtocolReceiver {
     ElasticFrameMessages stopReceiver();
 
     // C-API callback. If C++ is used this is a dummy callback
-    void gotData(pFramePtr &rPacket, ElasticFrameProtocolContext* pCTX);
+    void gotData(pFramePtr &rPacket, ElasticFrameProtocolContext* pCTX) const;
 
     // Method unpacking Type1 fragments
     ElasticFrameMessages unpackType1(const uint8_t *pSubPacket, size_t lPacketSize, uint8_t lFromSource);
diff --git a/logger.h b/logger.h
@@ -21,7 +21,7 @@ if (g == (LOGG_NOTIFY & (LOGG_MASK))) {a << "Notification: ";} \
 else if (g == (LOGG_WARN & (LOGG_MASK))) {a << "Warning: ";} \
 else if (g == (LOGG_ERROR & (LOGG_MASK))) {a << "Error: ";} \
 else if (g == (LOGG_FATAL & (LOGG_MASK))) {a << "Fatal: ";} \
-if (a.str().length()) { \
+if (!a.str().empty()) { \
 if (l) {a << __FILE__ << " " << __LINE__ << " ";} \
 a << f << std::endl; \
 std::cout << a.str(); \
@@ -31,4 +31,4 @@ std::cout << a.str(); \
 #define EFP_LOGGER(l,g,f)
 #endif
 
-#endif
+#endif
diff --git a/unitTests/UnitTest14.cpp b/unitTests/UnitTest14.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <memory>
 
 #include "ElasticFrameProtocol.h"
diff --git a/unitTests/UnitTest15.cpp b/unitTests/UnitTest15.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <memory>
 
 #include "ElasticFrameProtocol.h"
diff --git a/unitTests/UnitTest16.cpp b/unitTests/UnitTest16.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <memory>
 #include <random>
 
diff --git a/unitTests/UnitTest17.cpp b/unitTests/UnitTest17.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <memory>
 
 #include "ElasticFrameProtocol.h"
diff --git a/unitTests/UnitTest19.cpp b/unitTests/UnitTest19.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <memory>
 
 #include "ElasticFrameProtocol.h"
diff --git a/unitTests/UnitTest21.cpp b/unitTests/UnitTest21.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <memory>
 
 #include "ElasticFrameProtocol.h"
diff --git a/unitTests/UnitTest22.cpp b/unitTests/UnitTest22.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <memory>
 
 #include "ElasticFrameProtocol.h"
@@ -93,4 +94,4 @@ TEST(UnitTest22, HeadOfLineBlocking) {
     }
 
     EXPECT_EQ(dataReceived.load(), 4);
-}
+}
diff --git a/unitTests/UnitTest5.cpp b/unitTests/UnitTest5.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <memory>
 
 #include "ElasticFrameProtocol.h"
diff --git a/unitTests/UnitTest6.cpp b/unitTests/UnitTest6.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <memory>
 
 #include "ElasticFrameProtocol.h"
diff --git a/unitTests/UnitTest7.cpp b/unitTests/UnitTest7.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <memory>
 
 #include "ElasticFrameProtocol.h"
diff --git a/unitTests/UnitTest8.cpp b/unitTests/UnitTest8.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <memory>
 
 #include "ElasticFrameProtocol.h"
diff --git a/unitTests/UnitTest9.cpp b/unitTests/UnitTest9.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <memory>
 
 #include "ElasticFrameProtocol.h"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`#include <gtest/gtest.h>`
`2`	`2`
	`3`	`+#include <algorithm>`
`3`	`4`	`#include <memory>`
`4`	`5`
`5`	`6`	`#include "ElasticFrameProtocol.h"`
`@@ -93,4 +94,4 @@ TEST(UnitTest22, HeadOfLineBlocking) {`
`93`	`94`	`}`
`94`	`95`
`95`	`96`	`EXPECT_EQ(dataReceived.load(), 4);`
`96`		`-}`
	`97`	`+}`