Workaround msvc2015 bug with explicit copy-constructor for const_iter…

…ator
nlohmann · Jun 21, 2019 · 4c23af1 · 4c23af1
1 parent bf09f78
commit 4c23af1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/include/nlohmann/detail/iterators/iter_impl.hpp b/include/nlohmann/detail/iterators/iter_impl.hpp
@@ -118,6 +118,13 @@ class iter_impl
  to iterator is not defined.
  */
 
+ /* We had to explicitly define the copy constructor for the const
+ case to circumvent a bug on msvc 2015 debug build.
+ More info: https:/nlohmann/json/issues/1608
+ */
+ iter_impl(const iter_impl<const BasicJsonType>& other) noexcept
+ : m_object(other.m_object), m_it(other.m_it) {}
+
  /*!
  @brief converting constructor
  @param[in] other non-const iterator to copy from

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -7821,6 +7821,13 @@ class iter_impl
  to iterator is not defined.
  */
 
+ /* We had to explicitly define the copy constructor for the const
+ case to circumvent a bug on msvc 2015 debug build.
+ More info: https:/nlohmann/json/issues/1608
+ */
+ iter_impl(const iter_impl<const BasicJsonType>& other) noexcept
+ : m_object(other.m_object), m_it(other.m_it) {}
+
  /*!
  @brief converting constructor
  @param[in] other non-const iterator to copy from