[toolchain upgrade] fixed build errors and warnings in gcc6x mode

Change-Id: I918d8d9ba3acbebbc4433333f893b46c4d606347

diff --git a/src/view/gesture_detector.h b/src/view/gesture_detector.h
index 46368c50e0dc2f9de5cbf1bf7f5752f7a3ec7f95..84c7f4e8fe70e9ae3d2aa808e310b6a7f97bd4cb 100644 (file)
--- a/src/view/gesture_detector.h
+++ b/src/view/gesture_detector.h
@@ -50,10 +50,17 @@ namespace view
                /* Half a second is a popular duration of double click in UI */
                static const unsigned int __CLICK_DURATION = 500 * __MIL_SEC;
                static const unsigned int __DOUBLE_CLICK_DURATION = __CLICK_DURATION;
+#if (__cplusplus >= 201103L)
+               static constexpr double __TAP_DURATION = 0.5;
+               /* Half a second is a popular duration of double click in UI
+               * however, sometimes it is 1 second */
+               static constexpr double __LONG_PRESS_DURATION = 0.5;
+#else
                static const double __TAP_DURATION = 0.5;
                /* Half a second is a popular duration of double click in UI
                * however, sometimes it is 1 second */
                static const double __LONG_PRESS_DURATION = 0.5;
+#endif
 
        public:
 

diff --git a/src/view/inertial_camera.h b/src/view/inertial_camera.h
index 29ef53aeb9aa394fb257f3c16ee7a6c4892c8198..54b37f7e377b2d65b96c989d1a061b5c748edc71 100644 (file)
--- a/src/view/inertial_camera.h
+++ b/src/view/inertial_camera.h
@@ -38,9 +38,15 @@ namespace view
                /* Is transition performing right now */
                bool transiting;
        protected:
+#if (__cplusplus >= 201103L)
+               static constexpr double __GEO_ACCURACY = 0.00001;
+               static constexpr double __ZOOM_ACCURACY = 0.1;
+               static constexpr double __ROTATE_ACCURACY = 0.5;
+#else
                static const double __GEO_ACCURACY = 0.00001;
                static const double __ZOOM_ACCURACY = 0.1;
                static const double __ROTATE_ACCURACY = 0.5;
+#endif
        public:
                inertial_camera(maps_view_h view);
                ~inertial_camera();

diff --git a/src/view/inertial_gesture.h b/src/view/inertial_gesture.h
index 3b2f19ed8eb088fd4b24a5133c577ed5b944e895..23be5ed6923c8c1d8ffd54d9eb182c6a9ebbed30 100644 (file)
--- a/src/view/inertial_gesture.h
+++ b/src/view/inertial_gesture.h
@@ -38,7 +38,11 @@ namespace view
                unsigned transiting_start[MAX_FINGERS];
                double _dt[MAX_FINGERS];
        private:
+#if (__cplusplus >= 201103L)
+               static constexpr double __ACCURACY = 1;
+#else
                static const double __ACCURACY = 1;
+#endif
        public:
                inertial_gesture(maps_view_h view);
                ~inertial_gesture();