Use __declspec(noreturn) on Windows instead of [[noreturn]].

MSVC doesn't support [[noreturn]] yet.
osmcode · Aug 25, 2014 · 32b2331 · 32b2331
1 parent 15d3dc7
commit 32b2331
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/include/osmium/index/index.hpp b/include/osmium/index/index.hpp
@@ -65,10 +65,7 @@ namespace osmium {
     namespace index {
 
         template <typename TKey>
-#ifndef _MSC_VER
-        [[noreturn]]
-#endif
-        void not_found_error(TKey key) {
+        OSMIUM_NORETURN void not_found_error(TKey key) {
             std::stringstream s;
             s << "id " << key << " no found";
             throw not_found(s.str());

diff --git a/include/osmium/io/bzip2_compression.hpp b/include/osmium/io/bzip2_compression.hpp
@@ -41,22 +41,20 @@ DEALINGS IN THE SOFTWARE.
 
 #include <bzlib.h>
 #ifndef _MSC_VER
-#include <unistd.h>
+# include <unistd.h>
 #endif
 
 #include <osmium/io/compression.hpp>
 #include <osmium/io/file_compression.hpp>
+#include <osmium/util/compatibility.hpp>
 
 namespace osmium {
 
     namespace io {
 
         namespace detail {
 
-#ifndef _MSC_VER
-            [[noreturn]]
-#endif
-            inline void throw_bzip2_error(const std::string& msg, int error) {
+            OSMIUM_NORETURN inline void throw_bzip2_error(const std::string& msg, int error) {
                 throw std::runtime_error("bzip2 error: " + msg + ": " + std::to_string(error));
             }
 

diff --git a/include/osmium/io/compression.hpp b/include/osmium/io/compression.hpp
@@ -49,6 +49,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include <osmium/io/detail/read_write.hpp>
 #include <osmium/io/file_compression.hpp>
+#include <osmium/util/compatibility.hpp>
 
 namespace osmium {
 
@@ -120,10 +121,7 @@ namespace osmium {
             CompressionFactory(CompressionFactory&&) = delete;
             CompressionFactory& operator=(CompressionFactory&&) = delete;
 
-#ifndef _MSC_VER
-            [[noreturn]]
-#endif
-            void error(osmium::io::file_compression compression) {
+            OSMIUM_NORETURN void error(osmium::io::file_compression compression) {
                 std::string error_message {"Support for compression '"};
                 error_message += as_string(compression);
                 error_message += "' not compiled into this binary.";

diff --git a/include/osmium/util/compatibility.hpp b/include/osmium/util/compatibility.hpp
@@ -33,11 +33,15 @@ DEALINGS IN THE SOFTWARE.
 
 */
 
-// Workaround for MSVC which doesn't support constexpr in all cases yet
+// Workarounds for MSVC which doesn't support
+// * constexpr in all cases yet
+// * [[noreturn]]
 #ifdef _MSC_VER
 # define OSMIUM_CONSTEXPR
+# define OSMIUM_NORETURN __declspec(noreturn)
 #else
 # define OSMIUM_CONSTEXPR constexpr
+# define OSMIUM_NORETURN [[noreturn]]
 #endif
 
 #endif // OSMIUM_CONFIG_CONSTEXPR_HPP