update to qpcpp v7.0.0

mattheweshleman · mattheweshleman · commit f260c2c17aba · 2022-05-09T15:34:59.000-05:00
diff --git a/examples/hwLockCtrlService/include/hwLockCtrlSelfTestEvent.hpp b/examples/hwLockCtrlService/include/hwLockCtrlSelfTestEvent.hpp
@@ -24,7 +24,7 @@
 #ifndef HWLOCKCTRLSELFTESTEVENT_HPP
 #define HWLOCKCTRLSELFTESTEVENT_HPP
 
-#include "qpcpp.h"
+#include "qpcpp.hpp"
 #include "hwLockCtrlSelfTestResultEnum.hpp"
 
 namespace cms {
diff --git a/externals/qpcpp b/externals/qpcpp
@@ -1 +1 @@
-Subproject commit 518a85e939bfd57443070d35194f4d280f47bb6d
+Subproject commit 5c1286ad6711d5d9d9a76184944e4d42bbc7adb5
diff --git a/include/pubsub_signals.hpp b/include/pubsub_signals.hpp
@@ -5,7 +5,7 @@
 #ifndef PUB_SUB_SIGNALS_HPP
 #define PUB_SUB_SIGNALS_HPP
 
-#include "qpcpp.h"
+#include "qpcpp.hpp"
 
 namespace PubSub {
 
diff --git a/test_support/cpputest-qpcpp-port/include/cms_cpputest_qf_ctrl.hpp b/test_support/cpputest-qpcpp-port/include/cms_cpputest_qf_ctrl.hpp
@@ -26,7 +26,7 @@
 #define CPPUTEST_FOR_QPCPP_CMS_CPPUTEST_QF_CTRL_HPP
 
 #include <chrono>
-#include "qpcpp.h"
+#include "qpcpp.hpp"
 #include <vector>
 
 namespace cms {
diff --git a/test_support/cpputest-qpcpp-port/src/cms_cpputest_qf_ctrl.cpp b/test_support/cpputest-qpcpp-port/src/cms_cpputest_qf_ctrl.cpp
@@ -24,7 +24,7 @@
 
 #include "cms_cpputest_qf_ctrl.hpp"
 #include "cmsTestPublishedEventRecorder.hpp"
-#include "qpcpp.h"
+#include "qpcpp.hpp"
 #include <algorithm>
 #include <cassert>
 #include <cstdint>
@@ -126,13 +126,17 @@ void MoveTimeForward(const std::chrono::milliseconds& duration)
     assert(l_ticksPerSecond != 0);
     assert(duration.count() >= 0);
 
+    using LoopCounter_t = uint64_t;
+
+    constexpr LoopCounter_t ONCE = 1;
+
     double millisecondsPerTick = 1000.0 / l_ticksPerSecond;
 
     // if called, ensure at least one tick is processed
-    uint64_t ticks = std::max(
-      1UL, static_cast<uint64_t>(duration.count() / millisecondsPerTick));
+    LoopCounter_t ticks = std::max(
+      ONCE, static_cast<LoopCounter_t>(duration.count() / millisecondsPerTick));
 
-    for (uint64_t i = 0; i < ticks; ++i) {
+    for (LoopCounter_t i = 0; i < ticks; ++i) {
         QP::QF::tickX_(0U);
         ProcessEvents();
     }
diff --git a/test_support/cpputest-qpcpp-port/src/cms_cpputest_qf_onCleanup.cpp b/test_support/cpputest-qpcpp-port/src/cms_cpputest_qf_onCleanup.cpp
@@ -1,6 +1,6 @@
 
 #include "CppUTest/TestHarness.h"
-#include "qpcpp.h"
+#include "qpcpp.hpp"
 
 namespace QP {
 
@@ -11,7 +11,7 @@ void QF::onCleanup()
 {
     for (int i = 0; i < QF_maxPool_; ++i) {
         CHECK_TRUE_TEXT(QF_pool_[i].m_nTot == QF_pool_[i].m_nFree,
-                        "A leak was detected in an internal QF event pool!");
+                        "A leak was detected in an internal QF event pool!")
     }
 }
 
diff --git a/test_support/cpputest-qpcpp-port/test/cms_cpputest_qf_ctrlPublishTests.cpp b/test_support/cpputest-qpcpp-port/test/cms_cpputest_qf_ctrlPublishTests.cpp
@@ -23,7 +23,7 @@
 
 #include "cmsTestPublishedEventRecorder.hpp"
 #include "cms_cpputest_qf_ctrl.hpp"
-#include "qpcpp.h"
+#include "qpcpp.hpp"
 #include "CppUTest/TestHarness.h"
 
 using namespace cms::test;
diff --git a/test_support/cpputest-qpcpp-port/test/cms_cpputest_qf_ctrlTests.cpp b/test_support/cpputest-qpcpp-port/test/cms_cpputest_qf_ctrlTests.cpp
@@ -23,7 +23,7 @@
 
 #include "cmsDummyActiveObject.hpp"
 #include "cms_cpputest_qf_ctrl.hpp"
-#include "qpcpp.h"
+#include "qpcpp.hpp"
 #include "CppUTest/TestHarness.h"
 
 namespace QP {
diff --git a/test_support/cpputest-qpcpp-port/test/publishedEventRecorderTests.cpp b/test_support/cpputest-qpcpp-port/test/publishedEventRecorderTests.cpp
@@ -21,7 +21,7 @@
 ///***************************************************************************
 /// @endcond
 
-#include "qpcpp.h"
+#include "qpcpp.hpp"
 #include "cms_cpputest_qf_ctrl.hpp"
 #include "cmsTestPublishedEventRecorder.hpp"
 #include "CppUTest/TestHarness.h"
diff --git a/utilities/include/cmsArrayBackedQEQueue.hpp b/utilities/include/cmsArrayBackedQEQueue.hpp
@@ -24,7 +24,7 @@
 #ifndef CMS_ARRAY_BACKED_QEQUEUE_HPP
 #define CMS_ARRAY_BACKED_QEQUEUE_HPP
 
-#include "qpcpp.h"
+#include "qpcpp.hpp"
 #include <cstdint>
 #include <array>
 
diff --git a/utilities/include/cmsVectorBackedQEQueue.hpp b/utilities/include/cmsVectorBackedQEQueue.hpp
@@ -24,7 +24,7 @@
 #ifndef CMS_VECTOR_BACKED_QEQUEUE_HPP
 #define CMS_VECTOR_BACKED_QEQUEUE_HPP
 
-#include "qpcpp.h"
+#include "qpcpp.hpp"
 #include <cstdint>
 #include <vector>
 
diff --git a/utilities/include/qevtUniquePtr.hpp b/utilities/include/qevtUniquePtr.hpp
@@ -24,7 +24,7 @@
 #ifndef CMS_QEVT_UNIQUE_PTR_HPP
 #define CMS_QEVT_UNIQUE_PTR_HPP
 
-#include "qpcpp.h"
+#include "qpcpp.hpp"
 #include <utility>
 
 namespace cms {
diff --git a/utilities/test/backedQueueTests.cpp b/utilities/test/backedQueueTests.cpp
@@ -28,7 +28,10 @@
 
 using namespace cms;
 
-TEST_GROUP(BackedQueueTests) {void setup() final {} void teardown() final {}};
+TEST_GROUP(BackedQueueTests) {
+  void setup() final {}
+  void teardown() final {}
+};
 
 TEST(BackedQueueTests, can_create_vector_backed_qequeue)
 {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`
`2`	`2`	`#include "CppUTest/TestHarness.h"`
`3`		`-#include "qpcpp.h"`
	`3`	`+#include "qpcpp.hpp"`
`4`	`4`
`5`	`5`	`namespace QP {`
`6`	`6`
`@@ -11,7 +11,7 @@ void QF::onCleanup()`
`11`	`11`	`{`
`12`	`12`	`for (int i = 0; i < QF_maxPool_; ++i) {`
`13`	`13`	`CHECK_TRUE_TEXT(QF_pool_[i].m_nTot == QF_pool_[i].m_nFree,`
`14`		`- "A leak was detected in an internal QF event pool!");`
	`14`	`+ "A leak was detected in an internal QF event pool!")`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`