summaryrefslogtreecommitdiff
path: root/include/lib/modernjson/detail/iterators
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2018-11-26 09:06:31 +0100
committerDaniel Friesel <derf@finalrewind.org>2018-11-26 09:06:31 +0100
commit1542f34f0e0fc53324f6fdc5905f4b77b252a789 (patch)
treed2126bc53f8759c36809ff25b9ae3a19fd7aa362 /include/lib/modernjson/detail/iterators
parente7711c06640f098323cab80934c198090e9120a3 (diff)
update nlohmann modernjson to v3.4 (with bson support)
Diffstat (limited to 'include/lib/modernjson/detail/iterators')
-rw-r--r--include/lib/modernjson/detail/iterators/internal_iterator.hpp4
-rw-r--r--include/lib/modernjson/detail/iterators/iter_impl.hpp4
-rw-r--r--include/lib/modernjson/detail/iterators/iteration_proxy.hpp7
-rw-r--r--include/lib/modernjson/detail/iterators/json_reverse_iterator.hpp4
-rw-r--r--include/lib/modernjson/detail/iterators/primitive_iterator.hpp4
5 files changed, 10 insertions, 13 deletions
diff --git a/include/lib/modernjson/detail/iterators/internal_iterator.hpp b/include/lib/modernjson/detail/iterators/internal_iterator.hpp
index 95f056d..e1c12a8 100644
--- a/include/lib/modernjson/detail/iterators/internal_iterator.hpp
+++ b/include/lib/modernjson/detail/iterators/internal_iterator.hpp
@@ -21,5 +21,5 @@ template<typename BasicJsonType> struct internal_iterator
/// generic iterator for all other types
primitive_iterator_t primitive_iterator {};
};
-}
-}
+} // namespace detail
+} // namespace nlohmann
diff --git a/include/lib/modernjson/detail/iterators/iter_impl.hpp b/include/lib/modernjson/detail/iterators/iter_impl.hpp
index 9e4795a..4ad94db 100644
--- a/include/lib/modernjson/detail/iterators/iter_impl.hpp
+++ b/include/lib/modernjson/detail/iterators/iter_impl.hpp
@@ -610,5 +610,5 @@ class iter_impl
/// the actual iterator of the associated instance
internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it;
};
-}
-}
+} // namespace detail
+} // namespace nlohmann
diff --git a/include/lib/modernjson/detail/iterators/iteration_proxy.hpp b/include/lib/modernjson/detail/iterators/iteration_proxy.hpp
index 2da7154..31cc9f0 100644
--- a/include/lib/modernjson/detail/iterators/iteration_proxy.hpp
+++ b/include/lib/modernjson/detail/iterators/iteration_proxy.hpp
@@ -39,9 +39,6 @@ template<typename IteratorType> class iteration_proxy
public:
explicit iteration_proxy_internal(IteratorType it) noexcept : anchor(it) {}
- iteration_proxy_internal(const iteration_proxy_internal&) = default;
- iteration_proxy_internal& operator=(const iteration_proxy_internal&) = default;
-
/// dereference operator (needed for range-based for)
iteration_proxy_internal& operator*()
{
@@ -124,5 +121,5 @@ template<typename IteratorType> class iteration_proxy
return iteration_proxy_internal(container.end());
}
};
-}
-}
+} // namespace detail
+} // namespace nlohmann
diff --git a/include/lib/modernjson/detail/iterators/json_reverse_iterator.hpp b/include/lib/modernjson/detail/iterators/json_reverse_iterator.hpp
index 2750de4..f3b5b5d 100644
--- a/include/lib/modernjson/detail/iterators/json_reverse_iterator.hpp
+++ b/include/lib/modernjson/detail/iterators/json_reverse_iterator.hpp
@@ -115,5 +115,5 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
return it.operator * ();
}
};
-}
-}
+} // namespace detail
+} // namespace nlohmann
diff --git a/include/lib/modernjson/detail/iterators/primitive_iterator.hpp b/include/lib/modernjson/detail/iterators/primitive_iterator.hpp
index db3f897..28d6f1a 100644
--- a/include/lib/modernjson/detail/iterators/primitive_iterator.hpp
+++ b/include/lib/modernjson/detail/iterators/primitive_iterator.hpp
@@ -116,5 +116,5 @@ class primitive_iterator_t
return *this;
}
};
-}
-}
+} // namespace detail
+} // namespace nlohmann