-
Notifications
You must be signed in to change notification settings - Fork 561
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
yaml_cpp: Changed recipe to build v0.5.3
Including: * Replaced GitHub automatic archive source with git source. * Added patch for obsolete boost/detail/iterator header. * Fixed Windows library name. * Fixed Clang platforms by enabling C++17 removed features - to get support for std::auto_ptr
- Loading branch information
Showing
2 changed files
with
42 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
Y/yaml_cpp/bundled/patches/boost_detail_iterator_obsolete.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
diff --git a/include/yaml-cpp/node/detail/iterator.h b/include/yaml-cpp/node/detail/iterator.h | ||
index 2c701af..232fca7 100644 | ||
--- a/include/yaml-cpp/node/detail/iterator.h | ||
+++ b/include/yaml-cpp/node/detail/iterator.h | ||
@@ -45,7 +45,7 @@ class iterator_base | ||
private: | ||
friend class boost::iterator_core_access; | ||
|
||
- void increment() { this->base_reference() = boost::next(this->base()); } | ||
+ void increment() { this->base_reference() = std::next(this->base()); } | ||
|
||
value_type dereference() const { | ||
const typename base_type::value_type& v = *this->base(); | ||
diff --git a/src/node_data.cpp b/src/node_data.cpp | ||
index a1ca900..0bdb6e7 100644 | ||
--- a/src/node_data.cpp | ||
+++ b/src/node_data.cpp | ||
@@ -104,7 +104,7 @@ void node_data::compute_seq_size() const { | ||
void node_data::compute_map_size() const { | ||
kv_pairs::iterator it = m_undefinedPairs.begin(); | ||
while (it != m_undefinedPairs.end()) { | ||
- kv_pairs::iterator jt = boost::next(it); | ||
+ kv_pairs::iterator jt = std::next(it); | ||
if (it->first->is_defined() && it->second->is_defined()) | ||
m_undefinedPairs.erase(it); | ||
it = jt; |