From 5a9fffe3ed879a3489ad2bbf74c54d7bab76cf91 Mon Sep 17 00:00:00 2001 From: Osenberg-Y Date: Thu, 26 Jul 2018 13:15:14 +0800 Subject: [PATCH] Fix compile failure on VS2015. Using const instead of constexpr --- include/mynteye/mynteye.h.in | 4 ++-- src/api/processor/depth_processor.cc | 2 ++ src/api/processor/depth_processor.h | 2 +- src/api/processor/disparity_processor.cc | 2 ++ src/api/processor/disparity_processor.h | 2 +- src/api/processor/points_processor.cc | 2 ++ src/api/processor/points_processor.h | 2 +- src/api/processor/rectify_processor.cc | 2 ++ src/api/processor/rectify_processor.h | 2 +- 9 files changed, 14 insertions(+), 6 deletions(-) diff --git a/include/mynteye/mynteye.h.in b/include/mynteye/mynteye.h.in index dd44894..c2c8eff 100644 --- a/include/mynteye/mynteye.h.in +++ b/include/mynteye/mynteye.h.in @@ -58,7 +58,7 @@ MYNTEYE_API_VERSION_CHECK( \ # define MYNTEYE_USE_NAMESPACE #endif -constexpr char MYNTEYE_SDK_ROOT_DIR[] = "@MYNTEYE_SDK_ROOT_DIR@"; -constexpr char MYNTEYE_SDK_INSTALL_DIR[] = "@MYNTEYE_SDK_INSTALL_DIR@"; +const char MYNTEYE_SDK_ROOT_DIR[] = "@MYNTEYE_SDK_ROOT_DIR@"; +const char MYNTEYE_SDK_INSTALL_DIR[] = "@MYNTEYE_SDK_INSTALL_DIR@"; #endif // MYNTEYE_MYNTEYE_H_ diff --git a/src/api/processor/depth_processor.cc b/src/api/processor/depth_processor.cc index 8d5c9d4..73769de 100644 --- a/src/api/processor/depth_processor.cc +++ b/src/api/processor/depth_processor.cc @@ -19,6 +19,8 @@ MYNTEYE_BEGIN_NAMESPACE +const char DepthProcessor::NAME[] = "DepthProcessor"; + DepthProcessor::DepthProcessor(std::int32_t proc_period) : Processor(std::move(proc_period)) { VLOG(2) << __func__ << ": proc_period=" << proc_period; diff --git a/src/api/processor/depth_processor.h b/src/api/processor/depth_processor.h index f7a94ba..44fe231 100644 --- a/src/api/processor/depth_processor.h +++ b/src/api/processor/depth_processor.h @@ -23,7 +23,7 @@ MYNTEYE_BEGIN_NAMESPACE class DepthProcessor : public Processor { public: - static constexpr auto &&NAME = "DepthProcessor"; + static const char NAME[]; explicit DepthProcessor(std::int32_t proc_period = 0); virtual ~DepthProcessor(); diff --git a/src/api/processor/disparity_processor.cc b/src/api/processor/disparity_processor.cc index ff3e71c..dbb5ab3 100644 --- a/src/api/processor/disparity_processor.cc +++ b/src/api/processor/disparity_processor.cc @@ -21,6 +21,8 @@ MYNTEYE_BEGIN_NAMESPACE +const char DisparityProcessor::NAME[] = "DisparityProcessor"; + DisparityProcessor::DisparityProcessor(std::int32_t proc_period) : Processor(std::move(proc_period)) { VLOG(2) << __func__ << ": proc_period=" << proc_period; diff --git a/src/api/processor/disparity_processor.h b/src/api/processor/disparity_processor.h index c1b8671..82b075f 100644 --- a/src/api/processor/disparity_processor.h +++ b/src/api/processor/disparity_processor.h @@ -29,7 +29,7 @@ MYNTEYE_BEGIN_NAMESPACE class DisparityProcessor : public Processor { public: - static constexpr auto &&NAME = "DisparityProcessor"; + static const char NAME[]; explicit DisparityProcessor(std::int32_t proc_period = 0); virtual ~DisparityProcessor(); diff --git a/src/api/processor/points_processor.cc b/src/api/processor/points_processor.cc index 0bb82ec..0d594b1 100644 --- a/src/api/processor/points_processor.cc +++ b/src/api/processor/points_processor.cc @@ -21,6 +21,8 @@ MYNTEYE_BEGIN_NAMESPACE +const char PointsProcessor::NAME[] = "PointsProcessor"; + PointsProcessor::PointsProcessor(cv::Mat Q, std::int32_t proc_period) : Processor(std::move(proc_period)), Q_(std::move(Q)) { VLOG(2) << __func__ << ": proc_period=" << proc_period; diff --git a/src/api/processor/points_processor.h b/src/api/processor/points_processor.h index 0519c39..04599da 100644 --- a/src/api/processor/points_processor.h +++ b/src/api/processor/points_processor.h @@ -25,7 +25,7 @@ MYNTEYE_BEGIN_NAMESPACE class PointsProcessor : public Processor { public: - static constexpr auto &&NAME = "PointsProcessor"; + static const char NAME[]; explicit PointsProcessor(cv::Mat Q, std::int32_t proc_period = 0); virtual ~PointsProcessor(); diff --git a/src/api/processor/rectify_processor.cc b/src/api/processor/rectify_processor.cc index f2289bc..31ce62c 100644 --- a/src/api/processor/rectify_processor.cc +++ b/src/api/processor/rectify_processor.cc @@ -24,6 +24,8 @@ MYNTEYE_BEGIN_NAMESPACE +const char RectifyProcessor::NAME[] = "RectifyProcessor"; + RectifyProcessor::RectifyProcessor( std::shared_ptr device, std::int32_t proc_period) : Processor(std::move(proc_period)) { diff --git a/src/api/processor/rectify_processor.h b/src/api/processor/rectify_processor.h index 17796b1..e3d9c2c 100644 --- a/src/api/processor/rectify_processor.h +++ b/src/api/processor/rectify_processor.h @@ -29,7 +29,7 @@ class Device; class RectifyProcessor : public Processor { public: - static constexpr auto &&NAME = "RectifyProcessor"; + static const char NAME[]; RectifyProcessor( std::shared_ptr device, std::int32_t proc_period = 0);