tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compile failure on VS2015. Using const instead of constexpr

Browse Source
This commit is contained in:
Osenberg-Y 2018-07-26 13:15:14 +08:00
parent 384ff028a8
commit 5a9fffe3ed
9 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/mynteye/mynteye.h.in
View File

@ -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_

2
src/api/processor/depth_processor.cc
View File

@ -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;

2
src/api/processor/depth_processor.h
View File

@ -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();

2
src/api/processor/disparity_processor.cc
View File

@ -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;

2
src/api/processor/disparity_processor.h
View File

@ -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();

2
src/api/processor/points_processor.cc
View File

@ -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;

2
src/api/processor/points_processor.h
View File

@ -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();

2
src/api/processor/rectify_processor.cc
View File

@ -24,6 +24,8 @@
MYNTEYE_BEGIN_NAMESPACE
const char RectifyProcessor::NAME[] = "RectifyProcessor";
RectifyProcessor::RectifyProcessor(
std::shared_ptr<Device> device, std::int32_t proc_period)
: Processor(std::move(proc_period)) {

2
src/api/processor/rectify_processor.h
View File

@ -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> device, std::int32_t proc_period = 0);