From 8d73ee8e2457f12efc95a58c3e1e047409638504 Mon Sep 17 00:00:00 2001 From: Tim Rakowski Date: Mon, 4 Sep 2017 21:41:11 +0200 Subject: [PATCH] Replaced references to deprecated Boost.TR1 boost/tr1 includes where removed with boost 1.65 Upstream-Status: Backported [https://github.com/ros/rospack/pull/80] --- include/rospack/rospack.h | 12 ++++++------ src/rospack.cpp | 34 +++++++++++++++++----------------- src/utils.cpp | 4 ++-- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/rospack/rospack.h b/include/rospack/rospack.h index 4389187..bb7bc2e 100644 --- a/include/rospack/rospack.h +++ b/include/rospack/rospack.h @@ -105,8 +105,8 @@ and Rosstack. #ifndef ROSPACK_ROSPACK_H #define ROSPACK_ROSPACK_H -#include -#include +#include +#include #include #include #include @@ -148,8 +148,8 @@ class ROSPACK_DECL Rosstackage std::string tag_; bool quiet_; std::vector search_paths_; - std::tr1::unordered_map > dups_; - std::tr1::unordered_map stackages_; + boost::unordered_map > dups_; + boost::unordered_map stackages_; Stackage* findWithRecrawl(const std::string& name); void log(const std::string& level, const std::string& msg, bool append_errno); void clearStackages(); @@ -159,7 +159,7 @@ class ROSPACK_DECL Rosstackage int depth, bool collect_profile_data, std::vector& profile_data, - std::tr1::unordered_set& profile_hash); + boost::unordered_set& profile_hash); bool isStackage(const std::string& path); void loadManifest(Stackage* stackage); void computeDeps(Stackage* stackage, bool ignore_errors=false, bool ignore_missing=false); @@ -171,7 +171,7 @@ class ROSPACK_DECL Rosstackage bool no_recursion_on_wet=false); void gatherDepsFull(Stackage* stackage, bool direct, traversal_order_t order, int depth, - std::tr1::unordered_set& deps_hash, + boost::unordered_set& deps_hash, std::vector& deps, bool get_indented_deps, std::vector& indented_deps, diff --git a/src/rospack.cpp b/src/rospack.cpp index 18be326..e106623 100644 --- a/src/rospack.cpp +++ b/src/rospack.cpp @@ -250,7 +250,7 @@ Rosstackage::~Rosstackage() void Rosstackage::clearStackages() { - for(std::tr1::unordered_map::const_iterator it = stackages_.begin(); + for(boost::unordered_map::const_iterator it = stackages_.begin(); it != stackages_.end(); ++it) { @@ -373,7 +373,7 @@ Rosstackage::crawl(std::vector search_path, search_paths_ = search_path; std::vector dummy; - std::tr1::unordered_set dummy2; + boost::unordered_set dummy2; for(std::vector::const_iterator p = search_paths_.begin(); p != search_paths_.end(); ++p) @@ -438,7 +438,7 @@ Rosstackage::contents(const std::string& name, std::set& packages) { Rospack rp2; - std::tr1::unordered_map::const_iterator it = stackages_.find(name); + boost::unordered_map::const_iterator it = stackages_.find(name); if(it != stackages_.end()) { std::vector search_paths; @@ -465,7 +465,7 @@ Rosstackage::contains(const std::string& name, std::string& path) { Rospack rp2; - for(std::tr1::unordered_map::const_iterator it = stackages_.begin(); + for(boost::unordered_map::const_iterator it = stackages_.begin(); it != stackages_.end(); ++it) { @@ -494,7 +494,7 @@ Rosstackage::contains(const std::string& name, void Rosstackage::list(std::set >& list) { - for(std::tr1::unordered_map::const_iterator it = stackages_.begin(); + for(boost::unordered_map::const_iterator it = stackages_.begin(); it != stackages_.end(); ++it) { @@ -510,7 +510,7 @@ Rosstackage::listDuplicates(std::vector& dups) { dups.resize(dups_.size()); int i = 0; - for(std::tr1::unordered_map >::const_iterator it = dups_.begin(); + for(boost::unordered_map >::const_iterator it = dups_.begin(); it != dups_.end(); ++it) { @@ -523,7 +523,7 @@ void Rosstackage::listDuplicatesWithPaths(std::map >& dups) { dups.clear(); - for(std::tr1::unordered_map >::const_iterator it = dups_.begin(); + for(boost::unordered_map >::const_iterator it = dups_.begin(); it != dups_.end(); ++it) { @@ -589,7 +589,7 @@ Rosstackage::depsIndent(const std::string& name, bool direct, { computeDeps(stackage); std::vector deps_vec; - std::tr1::unordered_set deps_hash; + boost::unordered_set deps_hash; std::vector indented_deps; gatherDepsFull(stackage, direct, POSTORDER, 0, deps_hash, deps_vec, true, indented_deps); for(std::vector::const_iterator it = indented_deps.begin(); @@ -1080,7 +1080,7 @@ Rosstackage::plugins(const std::string& name, const std::string& attrib, if(!depsOnDetail(name, true, stackages, true)) return false; // Also look in the package itself - std::tr1::unordered_map::const_iterator it = stackages_.find(name); + boost::unordered_map::const_iterator it = stackages_.find(name); if(it != stackages_.end()) { // don't warn here; it was done in depsOnDetail() @@ -1093,7 +1093,7 @@ Rosstackage::plugins(const std::string& name, const std::string& attrib, std::vector top_deps; if(!depsDetail(top, false, top_deps)) return false; - std::tr1::unordered_set top_deps_set; + boost::unordered_set top_deps_set; for(std::vector::iterator it = top_deps.begin(); it != top_deps.end(); ++it) @@ -1283,7 +1283,7 @@ Rosstackage::depsOnDetail(const std::string& name, bool direct, } try { - for(std::tr1::unordered_map::const_iterator it = stackages_.begin(); + for(boost::unordered_map::const_iterator it = stackages_.begin(); it != stackages_.end(); ++it) { @@ -1318,7 +1318,7 @@ Rosstackage::profile(const std::vector& search_path, { double start = time_since_epoch(); std::vector dcrs; - std::tr1::unordered_set dcrs_hash; + boost::unordered_set dcrs_hash; for(std::vector::const_iterator p = search_path.begin(); p != search_path.end(); ++p) @@ -1428,7 +1428,7 @@ Rosstackage::crawlDetail(const std::string& path, int depth, bool collect_profile_data, std::vector& profile_data, - std::tr1::unordered_set& profile_hash) + boost::unordered_set& profile_hash) { if(depth > MAX_CRAWL_DEPTH) throw Exception("maximum depth exceeded during crawl"); @@ -1777,7 +1777,7 @@ Rosstackage::gatherDeps(Stackage* stackage, bool direct, std::vector& deps, bool no_recursion_on_wet) { - std::tr1::unordered_set deps_hash; + boost::unordered_set deps_hash; std::vector indented_deps; gatherDepsFull(stackage, direct, order, 0, deps_hash, deps, false, indented_deps, no_recursion_on_wet); @@ -1786,7 +1786,7 @@ Rosstackage::gatherDeps(Stackage* stackage, bool direct, void _gatherDepsFull(Stackage* stackage, bool direct, traversal_order_t order, int depth, - std::tr1::unordered_set& deps_hash, + boost::unordered_set& deps_hash, std::vector& deps, bool get_indented_deps, std::vector& indented_deps, @@ -1872,7 +1872,7 @@ _gatherDepsFull(Stackage* stackage, bool direct, void Rosstackage::gatherDepsFull(Stackage* stackage, bool direct, traversal_order_t order, int depth, - std::tr1::unordered_set& deps_hash, + boost::unordered_set& deps_hash, std::vector& deps, bool get_indented_deps, std::vector& indented_deps, @@ -2054,7 +2054,7 @@ Rosstackage::writeCache() { char *rpp = getenv("ROS_PACKAGE_PATH"); fprintf(cache, "#ROS_PACKAGE_PATH=%s\n", (rpp ? rpp : "")); - for(std::tr1::unordered_map::const_iterator it = stackages_.begin(); + for(boost::unordered_map::const_iterator it = stackages_.begin(); it != stackages_.end(); ++it) fprintf(cache, "%s\n", it->second->path_.c_str()); diff --git a/src/utils.cpp b/src/utils.cpp index 97a557a..f41a00e 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "utils.h" @@ -41,7 +41,7 @@ deduplicate_tokens(const std::string& instring, std::string& outstring) { std::vector vec; - std::tr1::unordered_set set; + boost::unordered_set set; boost::split(vec, instring, boost::is_any_of("\t "), boost::token_compress_on); -- 2.13.6