🚑 fixed compilation error

nlohmann · Oct 7, 2018 · 6e49d9f · 6e49d9f
1 parent 3abb788
commit 6e49d9f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 22 deletions.
diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp
@@ -104,9 +104,9 @@ class lexer
 
     // delete because of pointer members
     lexer(const lexer&) = delete;
-    lexer(lexer&&) noexcept = default;
+    lexer(lexer&&) = delete;
     lexer& operator=(lexer&) = delete;
-    lexer& operator=(lexer&&) noexcept = default;
+    lexer& operator=(lexer&&) = delete;
     ~lexer() = default;
 
   private:

diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp
@@ -53,8 +53,8 @@ class serializer
     // delete because of pointer members
     serializer(const serializer&) = delete;
     serializer& operator=(const serializer&) = delete;
-    serializer(serializer&&) noexcept = default;
-    serializer& operator=(serializer&&) noexcept = default;
+    serializer(serializer&&) = delete;
+    serializer& operator=(serializer&&) = delete;
     ~serializer() = default;
 
     /*!

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -2373,9 +2373,9 @@ class lexer
 
     // delete because of pointer members
     lexer(const lexer&) = delete;
-    lexer(lexer&&) noexcept = default;
+    lexer(lexer&&) = delete;
     lexer& operator=(lexer&) = delete;
-    lexer& operator=(lexer&&) noexcept = default;
+    lexer& operator=(lexer&&) = delete;
     ~lexer() = default;
 
   private:
@@ -8510,22 +8510,20 @@ class binary_writer
                 {
                     return 'i';
                 }
-                else if ((std::numeric_limits<uint8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<uint8_t>::max)())
+                if ((std::numeric_limits<uint8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<uint8_t>::max)())
                 {
                     return 'U';
                 }
-                else if ((std::numeric_limits<int16_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<int16_t>::max)())
+                if ((std::numeric_limits<int16_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<int16_t>::max)())
                 {
                     return 'I';
                 }
-                else if ((std::numeric_limits<int32_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<int32_t>::max)())
+                if ((std::numeric_limits<int32_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<int32_t>::max)())
                 {
                     return 'l';
                 }
-                else  // no check and assume int64_t (see note above)
-                {
-                    return 'L';
-                }
+                // no check and assume int64_t (see note above)
+                return 'L';
             }
 
             case value_t::number_unsigned:
@@ -8534,22 +8532,20 @@ class binary_writer
                 {
                     return 'i';
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<uint8_t>::max)())
+                if (j.m_value.number_unsigned <= (std::numeric_limits<uint8_t>::max)())
                 {
                     return 'U';
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<int16_t>::max)())
+                if (j.m_value.number_unsigned <= (std::numeric_limits<int16_t>::max)())
                 {
                     return 'I';
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<int32_t>::max)())
+                if (j.m_value.number_unsigned <= (std::numeric_limits<int32_t>::max)())
                 {
                     return 'l';
                 }
-                else  // no check and assume int64_t (see note above)
-                {
-                    return 'L';
-                }
+                // no check and assume int64_t (see note above)
+                return 'L';
             }
 
             case value_t::number_float:
@@ -9765,8 +9761,8 @@ class serializer
     // delete because of pointer members
     serializer(const serializer&) = delete;
     serializer& operator=(const serializer&) = delete;
-    serializer(serializer&&) noexcept = default;
-    serializer& operator=(serializer&&) noexcept = default;
+    serializer(serializer&&) = delete;
+    serializer& operator=(serializer&&) = delete;
     ~serializer() = default;
 
     /*!