constexpr is still unsupported for classes on MSVC

alex85k · Aug 20, 2014 · e76438d · e76438d
1 parent aba2668
commit e76438d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/include/osmium/index/index.hpp b/include/osmium/index/index.hpp
@@ -90,7 +90,11 @@ namespace osmium {
          * the full range, so the max value is a good "empty" value.
          */
         template <>
-        inline constexpr size_t empty_value<size_t>() {
+        inline
+#ifndef _MSC_VER
+        constexpr
+#endif
+        size_t empty_value<size_t>() {
             return std::numeric_limits<size_t>::max();
         }
 

diff --git a/include/osmium/osm/box.hpp b/include/osmium/osm/box.hpp
@@ -129,7 +129,10 @@ namespace osmium {
         /**
          * Bottom-left location.
          */
-        constexpr Location bottom_left() const noexcept {
+        #ifndef _MSC_VER
+        constexpr
+        #endif
+        Location bottom_left() const noexcept {
             return m_bottom_left;
         }
 
@@ -143,7 +146,10 @@ namespace osmium {
         /**
          * Top-right location.
          */
-        constexpr Location top_right() const noexcept {
+         #ifndef _MSC_VER
+         constexpr
+         #endif
+         Location top_right() const noexcept{
             return m_top_right;
         }
 
@@ -177,7 +183,11 @@ namespace osmium {
     /**
      * Boxes are equal if both locations are equal.
      */
-    inline constexpr bool operator==(const Box& lhs, const Box& rhs) noexcept {
+    inline
+    #ifndef _MSC_VER
+    constexpr
+    #endif
+    bool operator==(const Box& lhs, const Box& rhs) noexcept {
         return lhs.bottom_left() == rhs.bottom_left() && lhs.top_right() == rhs.top_right();
     }
 

diff --git a/include/osmium/osm/timestamp.hpp b/include/osmium/osm/timestamp.hpp
@@ -134,11 +134,19 @@ namespace osmium {
 
     }; // class Timestamp
 
-    inline constexpr Timestamp start_of_time() {
+    inline
+#ifndef _MSC_VER
+    constexpr
+#endif
+    Timestamp start_of_time() {
         return Timestamp(1);
     }
 
-    inline constexpr Timestamp end_of_time() {
+    inline
+#ifndef _MSC_VER
+    constexpr
+#endif
+    Timestamp end_of_time() {
         return Timestamp(std::numeric_limits<time_t>::max());
     }