From 5675a495b076a49785c3f852dba744940ef612b0 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Thu, 22 Aug 2019 09:39:01 +0200 Subject: [PATCH] GCC compile fix --- src/interaction/externinteraction.cpp | 49 ++++++++++++------------- src/interaction/websocketinputstate.cpp | 1 + 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/interaction/externinteraction.cpp b/src/interaction/externinteraction.cpp index 13f6915a34..ab383a67ff 100644 --- a/src/interaction/externinteraction.cpp +++ b/src/interaction/externinteraction.cpp @@ -40,42 +40,39 @@ #include namespace { -const uint32_t ProtocolVersion = 3; -const size_t MaxLatencyDiffs = 64; -const char* _loggerCat = "ExternInteraction"; + constexpr const uint32_t ProtocolVersion = 3; + constexpr const size_t MaxLatencyDiffs = 64; -constexpr openspace::properties::Property::PropertyInfo BufferTimeInfo = { - "BufferTime", - "Buffer Time", - "" // @TODO Missing documentation -}; + constexpr openspace::properties::Property::PropertyInfo BufferTimeInfo = { + "BufferTime", + "Buffer Time", + "" // @TODO Missing documentation + }; -constexpr openspace::properties::Property::PropertyInfo TimeKeyFrameInfo = { - "TimeKeyframeInterval", - "Time keyframe interval", - "" // @TODO Missing documentation -}; + constexpr openspace::properties::Property::PropertyInfo TimeKeyFrameInfo = { + "TimeKeyframeInterval", + "Time keyframe interval", + "" // @TODO Missing documentation + }; -constexpr openspace::properties::Property::PropertyInfo CameraKeyFrameInfo = { - "CameraKeyframeInterval", - "Camera Keyframe interval", - "" // @TODO Missing documentation -}; - -constexpr openspace::properties::Property::PropertyInfo TimeToleranceInfo = { - "TimeTolerance", - "Time tolerance", - "" // @TODO Missing documentation -}; + constexpr openspace::properties::Property::PropertyInfo CameraKeyFrameInfo = { + "CameraKeyframeInterval", + "Camera Keyframe interval", + "" // @TODO Missing documentation + }; + constexpr openspace::properties::Property::PropertyInfo TimeToleranceInfo = { + "TimeTolerance", + "Time tolerance", + "" // @TODO Missing documentation + }; } // namespace namespace openspace { ExternInteraction::ExternInteraction() : properties::PropertyOwner({ "ExternInteration", "External Interaction" }) -{ -} +{} void ExternInteraction::cameraInteraction(datamessagestructures::CameraKeyframe kf) { interaction::KeyframeNavigator::CameraPose pose; diff --git a/src/interaction/websocketinputstate.cpp b/src/interaction/websocketinputstate.cpp index e49989147c..4a531c83bf 100644 --- a/src/interaction/websocketinputstate.cpp +++ b/src/interaction/websocketinputstate.cpp @@ -26,6 +26,7 @@ #include #include +#include #include #include