summaryrefslogtreecommitdiffhomepage
path: root/logic/pipeline.cpp
diff options
context:
space:
mode:
authormrsanchos <orokhovatskiy@gmail.com>2018-02-16 21:05:36 +0300
committermrsanchos <orokhovatskiy@gmail.com>2018-02-16 21:05:36 +0300
commitb52fd95f1cc86e86ecb696eab07c8d6b6a2e9f5d (patch)
treea8d5a8c98d8ca3b60b0805504049275a3311f59b /logic/pipeline.cpp
parent82c43da829fdac974b3d6adb8742715382ddd051 (diff)
parent7a973ae2ad396c8413405e40bcb2eaab67c95d15 (diff)
Merge branch 'unstable' of https://github.com/opentrack/opentrack into unstable
Diffstat (limited to 'logic/pipeline.cpp')
-rw-r--r--logic/pipeline.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/logic/pipeline.cpp b/logic/pipeline.cpp
index d690b406..9059a251 100644
--- a/logic/pipeline.cpp
+++ b/logic/pipeline.cpp
@@ -190,8 +190,6 @@ static bool is_nan(const dmat<u,w>& r)
return false;
}
-constexpr double pipeline::c_mult;
-constexpr double pipeline::c_div;
template<typename x, typename y, typename... xs>
static inline bool nan_check_(const x& datum, const y& next, const xs&... rest)
{
@@ -480,8 +478,9 @@ void pipeline::run()
#endif
{
- static constexpr const char* posechannels[6] = { "TX", "TY", "TZ", "Yaw", "Pitch", "Roll" };
- static constexpr const char* datachannels[5] = { "dt", "raw", "corrected", "filtered", "mapped" };
+ static const char* const posechannels[6] = { "TX", "TY", "TZ", "Yaw", "Pitch", "Roll" };
+ static const char* const datachannels[5] = { "dt", "raw", "corrected", "filtered", "mapped" };
+
logger.write(datachannels[0]);
char buffer[128];
for (unsigned j = 1; j < 5; ++j)