From 88aabd337f53bef54fedbca9860e558faec5be8c Mon Sep 17 00:00:00 2001 From: Ariel Lowenstein Date: Tue, 18 Jun 2019 16:45:59 +0300 Subject: [PATCH 1/3] wip --- src/log.h | 2 ++ src/media/ros/ros_file_format.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/log.h b/src/log.h index 5cf3d6b329..e90006c7ef 100644 --- a/src/log.h +++ b/src/log.h @@ -7,6 +7,7 @@ namespace librealsense { +#if BUILD_EASYLOGGINGPP template class logger_type { @@ -135,4 +136,5 @@ namespace librealsense open(); } }; +#endif //BUILD_EASYLOGGINGPP } diff --git a/src/media/ros/ros_file_format.h b/src/media/ros/ros_file_format.h index b10dbe676d..6530f4502c 100644 --- a/src/media/ros/ros_file_format.h +++ b/src/media/ros/ros_file_format.h @@ -525,7 +525,7 @@ namespace librealsense constexpr uint32_t get_device_index() { return 0; //TODO: change once SDK file supports multiple devices - } + }; constexpr device_serializer::nanoseconds get_static_file_info_timestamp() { From ed41ba01e065ebb0ecc4225b7d09407b856d9405 Mon Sep 17 00:00:00 2001 From: Ariel Lowenstein Date: Sun, 30 Jun 2019 09:51:02 +0300 Subject: [PATCH 2/3] fix easy-logging disablement bug --- src/tm2/tm-device.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tm2/tm-device.cpp b/src/tm2/tm-device.cpp index 1f2404aeea..6edbc5c8e2 100644 --- a/src/tm2/tm-device.cpp +++ b/src/tm2/tm-device.cpp @@ -1,6 +1,10 @@ // License: Apache 2.0. See LICENSE file in root directory. // Copyright(c) 2017 Intel Corporation. All Rights Reserved. +#ifndef NOMINMAX + #define NOMINMAX +#endif + #include #include #include "tm-device.h" From 0961cc0cb75943ad3667478539deca2860e15105 Mon Sep 17 00:00:00 2001 From: Ariel Lowenstein Date: Sun, 30 Jun 2019 09:55:59 +0300 Subject: [PATCH 3/3] cosmetic changes --- src/media/ros/ros_file_format.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/media/ros/ros_file_format.h b/src/media/ros/ros_file_format.h index 6530f4502c..b10dbe676d 100644 --- a/src/media/ros/ros_file_format.h +++ b/src/media/ros/ros_file_format.h @@ -525,7 +525,7 @@ namespace librealsense constexpr uint32_t get_device_index() { return 0; //TODO: change once SDK file supports multiple devices - }; + } constexpr device_serializer::nanoseconds get_static_file_info_timestamp() {