Skip to content

Commit 80bafd9

Browse files
Merge pull request #2 from vChavezB/zephyr_fix
Fixed compilation with Zephyr Posix
2 parents 8a2135e + d205962 commit 80bafd9

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "externals/qpcpp"]
22
path = externals/qpcpp
3-
url = git@github.com:QuantumLeaps/qpcpp.git
3+
url = https://github.com/QuantumLeaps/qpcpp.git

externals/qpcppCMakeSupport.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set(QP_CPP_TOP_DIR ${CMAKE_SOURCE_DIR}/externals/qpcpp)
1+
set(QP_CPP_TOP_DIR ${CMAKE_CURRENT_LIST_DIR}/../externals/qpcpp)
22
set(QP_CPP_SRC_DIR ${QP_CPP_TOP_DIR}/src)
33
set(QP_CPP_INCLUDE_DIR ${QP_CPP_TOP_DIR}/include)
44

test_support/cpputest-qpcpp-port/include/cmsDummyActiveObject.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "qpcpp.hpp"
3030
#include <array>
3131
#include <functional>
32+
#include <cstddef>
3233

3334
namespace cms {
3435

test_support/cpputest-qpcpp-port/src/cms_cpputest_q_onAssert.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@ Q_NORETURN Q_onAssert(char const* const file, int_t const loc)
5050
.withParameter("file", file)
5151
.withParameter("loc", loc);
5252

53-
TEST_EXIT
53+
TEST_EXIT;
5454
}

test_support/cpputest-qpcpp-port/src/cms_cpputest_qf_ctrl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void Teardown()
115115
const size_t poolNumOfEvents = l_pubSubEventMemPoolConfigs->at(i).config.numberOfEvents;
116116

117117
CHECK_TRUE_TEXT(poolNumOfEvents == QP::QF::ePool_[i].getNFree(),
118-
"A leak was detected in an internal QF event pool!")
118+
"A leak was detected in an internal QF event pool!");
119119
}
120120
}
121121

test_support/cpputest-qpcpp-port/test/cms_cpputest_qf_ctrlTests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ TEST(qf_ctrlTests,
122122
sigTwoCount++;
123123
}
124124
else {
125-
TEST_EXIT
125+
TEST_EXIT;
126126
}
127127
});
128128

0 commit comments

Comments
 (0)