Skip to content

Commit d52ec47

Browse files
authored
Merge pull request #61 from openDAQ/fix/chrono_and_cmake
Chrono includes, bugfixes of debug building and a bugfix out of scope reference
2 parents 73db69d + 1df4a11 commit d52ec47

File tree

7 files changed

+16
-3
lines changed

7 files changed

+16
-3
lines changed

asam_cmp_capture_module/src/capture_fb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void CaptureFb::startStatusLoop()
139139
void CaptureFb::stopStatusLoop()
140140
{
141141
{
142-
std::scoped_lock<std::mutex> lock(sync);
142+
auto lock2 = getRecursiveConfigLock();
143143
stopStatusSending = true;
144144
}
145145
cv.notify_one();

asam_cmp_capture_module/tests/ref_can_channel_impl.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#include <opendaq/signal_factory.h>
1515
#include "include/ref_can_channel_impl.h"
1616

17+
#include <chrono>
18+
1719
#define PI 3.141592653589793
1820

1921
namespace daq {

asam_cmp_capture_module/tests/ref_channel_impl.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#include <asam_cmp_capture_module/dispatch.h>
1717
#include <opendaq/sample_type_traits.h>
1818

19+
#include <chrono>
20+
1921
namespace daq
2022
{
2123

asam_cmp_common_lib/src/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ if(UNIX)
3535
target_compile_options(${PROJECT_NAME} PRIVATE -fPIC)
3636
endif()
3737

38+
if (MSVC)
39+
target_compile_options(${PROJECT_NAME} PRIVATE /bigobj)
40+
endif()
41+
3842
target_link_libraries(${PROJECT_NAME} PUBLIC daq::opendaq
3943
Pcap++
4044
asam_cmp

asam_cmp_data_sink/src/stream_fb.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
#include <asam_cmp_common_lib/unit_converter.h>
44
#include <asam_cmp_data_sink/stream_fb.h>
55

6+
7+
#include <chrono>
8+
9+
610
BEGIN_NAMESPACE_ASAM_CMP_DATA_SINK_MODULE
711

812
StreamFb::StreamFb(const ContextPtr& ctx,

asam_cmp_data_sink/tests/test_stream_fb.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
#include <opendaq/scheduler_factory.h>
1616
#include <opendaq/search_filter_factory.h>
1717
#include <thread>
18+
#include <chrono>
1819

19-
using namespace std::chrono_literals;
20+
using namespace std::literals;
2021

2122
using namespace daq;
2223
using ASAM::CMP::AnalogPayload;

external/openDAQ/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set(OPENDAQ_ENABLE_TESTS false)
33
FetchContent_Declare(
44
openDAQ
55
GIT_REPOSITORY https://github.com/openDAQ/openDAQ.git
6-
GIT_TAG 4ad72a2c8e0cece80a9898dd844dff3f53f43f2f
6+
GIT_TAG 14b647f955078e7d146513cfb2edc24a675fe679
77
GIT_PROGRESS ON
88
SYSTEM
99
FIND_PACKAGE_ARGS 3.0.0 GLOBAL

0 commit comments

Comments
 (0)