diff --git a/include/rospack/rospack_backcompat.h b/include/rospack/rospack_backcompat.h index 9af57f0..bd60ec0 100644 --- a/include/rospack/rospack_backcompat.h +++ b/include/rospack/rospack_backcompat.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2008, Willow Garage, Inc. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright notice, diff --git a/src/rospack.cpp b/src/rospack.cpp index 610bb0f..4a2b3cb 100644 --- a/src/rospack.cpp +++ b/src/rospack.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2008, Willow Garage, Inc., Morgan Quigley - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright notice, @@ -209,8 +209,8 @@ class DirectoryCrawlRecord double start_time_; double crawl_time_; size_t start_num_pkgs_; - DirectoryCrawlRecord(std::string path, - double start_time, + DirectoryCrawlRecord(std::string path, + double start_time, size_t start_num_pkgs) : path_(path), zombie_(false), @@ -239,7 +239,7 @@ Rosstackage::Rosstackage(const std::string& manifest_name, { } -void +void Rosstackage::logWarn(const std::string& msg, bool append_errno) { @@ -267,7 +267,7 @@ Rosstackage::getSearchPathFromEnv(std::vector& sp) #endif std::vector rpp_strings; - boost::split(rpp_strings, rpp, + boost::split(rpp_strings, rpp, boost::is_any_of(path_delim), boost::token_compress_on); for(std::vector::const_iterator it = rpp_strings.begin(); @@ -385,13 +385,13 @@ Rosstackage::crawl(std::vector search_path, p != search_paths_.end(); ++p) crawlDetail(*p, force, 1, false, dummy, dummy2); - + crawled_ = true; writeCache(); } -bool +bool Rosstackage::inStackage(std::string& name) { fs::path path; @@ -441,7 +441,7 @@ Rosstackage::find(const std::string& name, std::string& path) } bool -Rosstackage::contents(const std::string& name, +Rosstackage::contents(const std::string& name, std::set& packages) { Rospack rp2; @@ -467,7 +467,7 @@ Rosstackage::contents(const std::string& name, } bool -Rosstackage::contains(const std::string& name, +Rosstackage::contains(const std::string& name, std::string& stack, std::string& path) { @@ -498,21 +498,21 @@ Rosstackage::contains(const std::string& name, return false; } -void +void Rosstackage::list(std::set >& list) { for(std::tr1::unordered_map::const_iterator it = stackages_.begin(); it != stackages_.end(); ++it) { - std::pair item; - item.first = it->first; - item.second = it->second->path_; - list.insert(item); + std::pair item; + item.first = it->first; + item.second = it->second->path_; + list.insert(item); } } -void +void Rosstackage::listDuplicates(std::vector& dups) { dups.resize(dups_.size()); @@ -634,7 +634,7 @@ Rosstackage::depsWhy(const std::string& from, logError(e.what()); return true; } - output.append(std::string("Dependency chains from ") + + output.append(std::string("Dependency chains from ") + from + " to " + to + ":\n"); for(std::list >::const_iterator it = acc_list.begin(); it != acc_list.end(); @@ -655,7 +655,7 @@ Rosstackage::depsWhy(const std::string& from, } bool -Rosstackage::depsManifests(const std::string& name, bool direct, +Rosstackage::depsManifests(const std::string& name, bool direct, std::vector& manifests) { Stackage* stackage = findWithRecrawl(name); @@ -680,7 +680,7 @@ Rosstackage::depsManifests(const std::string& name, bool direct, } bool -Rosstackage::rosdeps(const std::string& name, bool direct, +Rosstackage::rosdeps(const std::string& name, bool direct, std::set& rosdeps) { Stackage* stackage = findWithRecrawl(name); @@ -746,7 +746,7 @@ Rosstackage::_rosdeps(Stackage* stackage, std::set& rosdeps, const } bool -Rosstackage::vcs(const std::string& name, bool direct, +Rosstackage::vcs(const std::string& name, bool direct, std::vector& vcs) { Stackage* stackage = findWithRecrawl(name); @@ -793,7 +793,7 @@ Rosstackage::vcs(const std::string& name, bool direct, return true; } -bool +bool Rosstackage::cpp_exports(const std::string& name, const std::string& type, const std::string& attrib, bool deps_only, std::vector >& flags) @@ -968,7 +968,7 @@ Rosstackage::reorder_paths(const std::string& paths, std::string& reordered) return true; } -bool +bool Rosstackage::exports(const std::string& name, const std::string& lang, const std::string& attrib, bool deps_only, std::vector& flags) @@ -1001,7 +1001,7 @@ Rosstackage::exports(const std::string& name, const std::string& lang, return true; } -bool +bool Rosstackage::exports_dry_package(Stackage* stackage, const std::string& lang, const std::string& attrib, std::vector& flags) @@ -1069,8 +1069,8 @@ Rosstackage::exports_dry_package(Stackage* stackage, const std::string& lang, return true; } -bool -Rosstackage::plugins(const std::string& name, const std::string& attrib, +bool +Rosstackage::plugins(const std::string& name, const std::string& attrib, const std::string& top, std::vector& flags) { @@ -1136,7 +1136,7 @@ Rosstackage::plugins(const std::string& name, const std::string& attrib, } bool -Rosstackage::depsMsgSrv(const std::string& name, bool direct, +Rosstackage::depsMsgSrv(const std::string& name, bool direct, std::vector& gens) { Stackage* stackage = findWithRecrawl(name); @@ -1151,11 +1151,11 @@ Rosstackage::depsMsgSrv(const std::string& name, bool direct, it != deps_vec.end(); ++it) { - fs::path msg_gen = fs::path((*it)->path_) / - MSG_GEN_GENERATED_DIR / + fs::path msg_gen = fs::path((*it)->path_) / + MSG_GEN_GENERATED_DIR / MSG_GEN_GENERATED_FILE; - fs::path srv_gen = fs::path((*it)->path_) / - SRV_GEN_GENERATED_DIR / + fs::path srv_gen = fs::path((*it)->path_) / + SRV_GEN_GENERATED_DIR / SRV_GEN_GENERATED_FILE; if(fs::is_regular_file(msg_gen)) gens.push_back(msg_gen.string()); @@ -1175,7 +1175,7 @@ Rosstackage::depsMsgSrv(const std::string& name, bool direct, // Rosstackage methods (private) ///////////////////////////////////////////////////////////// -void +void Rosstackage::log(const std::string& level, const std::string& msg, bool append_errno) @@ -1354,7 +1354,7 @@ Rosstackage::profile(const std::vector& search_path, char buf[16]; snprintf(buf, sizeof(buf), "%.6f", (*it)->crawl_time_); if(length < 0 || i < length) - dirs.push_back(std::string(buf) + " " + + dirs.push_back(std::string(buf) + " " + ((*it)->zombie_ ? "* " : " ") + (*it)->path_); i++; @@ -1525,7 +1525,7 @@ Rosstackage::crawlDetail(const std::string& path, { // Measure the elapsed time dcr->crawl_time_ = time_since_epoch() - dcr->start_time_; - // If the number of packages didn't change while crawling, + // If the number of packages didn't change while crawling, // then this directory is a zombie if(stackages_.size() == dcr->start_num_pkgs_) dcr->zombie_ = true; @@ -1540,7 +1540,7 @@ Rosstackage::loadManifest(Stackage* stackage) if(!stackage->manifest_.LoadFile(stackage->manifest_path_)) { - std::string errmsg = std::string("error parsing manifest of package ") + + std::string errmsg = std::string("error parsing manifest of package ") + stackage->name_ + " at " + stackage->manifest_path_; throw Exception(errmsg); } @@ -1658,7 +1658,7 @@ Rosstackage::isSysPackage(const std::string& pkgname) return cache.find(pkgname)->second; } - initPython(); + initPython(); PyGILState_STATE gstate = PyGILState_Ensure(); static PyObject* pModule = 0; @@ -1759,14 +1759,14 @@ Rosstackage::isSysPackage(const std::string& pkgname) } void -Rosstackage::gatherDeps(Stackage* stackage, bool direct, +Rosstackage::gatherDeps(Stackage* stackage, bool direct, traversal_order_t order, std::vector& deps, bool no_recursion_on_wet) { std::tr1::unordered_set deps_hash; std::vector indented_deps; - gatherDepsFull(stackage, direct, order, 0, + gatherDepsFull(stackage, direct, order, 0, deps_hash, deps, false, indented_deps, no_recursion_on_wet); } @@ -1889,11 +1889,11 @@ Rosstackage::getCachePath() { // Get the user's home directory by looking up the password entry based // on UID. If that doesn't work, we fall back on examining $HOME, - // knowing that that can cause trouble when mixed with sudo (#2884). + // knowing that that can cause trouble when mixed with sudo (#2884). #if defined(WIN32) char* home_drive = getenv("HOMEDRIVE"); char* home_path = getenv("HOMEPATH"); - if(home_drive && home_path) + if(home_drive && home_path) cache_path = fs::path(home_drive) / fs::path(home_path) / fs::path(DOTROS_NAME); #else // UNIX char* home_path; @@ -2022,7 +2022,7 @@ Rosstackage::writeCache() int fd = mkstemp(tmp_cache_path); if (fd < 0) { - fprintf(stderr, "[rospack] Unable to create temporary cache file %s: %s\n", + fprintf(stderr, "[rospack] Unable to create temporary cache file %s: %s\n", tmp_cache_path, strerror(errno)); } else @@ -2031,7 +2031,7 @@ Rosstackage::writeCache() #endif if (!cache) { - fprintf(stderr, "[rospack] Unable open cache file %s: %s\n", + fprintf(stderr, "[rospack] Unable open cache file %s: %s\n", tmp_cache_path, strerror(errno)); } else @@ -2047,7 +2047,7 @@ Rosstackage::writeCache() remove(cache_path.c_str()); if(rename(tmp_cache_path, cache_path.c_str()) < 0) { - fprintf(stderr, "[rospack] Error: failed to rename cache file %s to %s: %s\n", + fprintf(stderr, "[rospack] Error: failed to rename cache file %s to %s: %s\n", tmp_cache_path, cache_path.c_str(), strerror(errno)); } } @@ -2075,7 +2075,7 @@ Rosstackage::validateCache() if ((cache_max_age > 0.0) && (dt > cache_max_age)) return NULL; } - // try to open it + // try to open it FILE* cache = fopen(cache_path.c_str(), "r"); if(!cache) return NULL; // it's not readable by us. sad. @@ -2129,10 +2129,10 @@ Rosstackage::expandExportString(Stackage* stackage, i != std::string::npos; i = outstring.find(MANIFEST_PREFIX)) { - outstring.replace(i, std::string(MANIFEST_PREFIX).length(), + outstring.replace(i, std::string(MANIFEST_PREFIX).length(), stackage->path_); } - + // skip substitution attempt when the string neither contains // a dollar sign for $(command) and $envvar nor // a backtick wrapping a command @@ -2155,7 +2155,7 @@ Rosstackage::expandExportString(Stackage* stackage, // Remove embedded newlines std::string token("\n"); - for (std::string::size_type s = cmd.find(token); + for (std::string::size_type s = cmd.find(token); s != std::string::npos; s = cmd.find(token, s)) cmd.replace(s,token.length(),std::string(" ")); @@ -2163,7 +2163,7 @@ Rosstackage::expandExportString(Stackage* stackage, FILE* p; if(!(p = popen(cmd.c_str(), "r"))) { - std::string errmsg = + std::string errmsg = std::string("failed to execute backquote expression ") + cmd + " in " + stackage->manifest_path_; @@ -2183,7 +2183,7 @@ Rosstackage::expandExportString(Stackage* stackage, // Close the subprocess, checking exit status if(pclose(p) != 0) { - std::string errmsg = + std::string errmsg = std::string("got non-zero exit status from executing backquote expression ") + cmd + " in " + stackage->manifest_path_; @@ -2222,7 +2222,7 @@ Rosstackage::~Rosstackage() } } -const char* +const char* Rospack::usage() { return "USAGE: rospack [options] [package]\n" @@ -2270,7 +2270,7 @@ Rosstack::Rosstack() : { } -const char* +const char* Rosstack::usage() { return "USAGE: rosstack [options] [stack]\n" @@ -2300,14 +2300,14 @@ get_manifest_root(Stackage* stackage) TiXmlElement* ele = stackage->manifest_.RootElement(); if(!ele) { - std::string errmsg = std::string("error parsing manifest of package ") + + std::string errmsg = std::string("error parsing manifest of package ") + stackage->name_ + " at " + stackage->manifest_path_; throw Exception(errmsg); } return ele; } -double +double time_since_epoch() { #if defined(WIN32) diff --git a/src/rospack_backcompat.cpp b/src/rospack_backcompat.cpp index 0bccca1..5caf2b4 100644 --- a/src/rospack_backcompat.cpp +++ b/src/rospack_backcompat.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2008, Willow Garage, Inc., Morgan Quigley - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright notice, @@ -37,7 +37,7 @@ namespace rospack { -int +int ROSPack::run(int argc, char** argv) { rospack::Rospack rp; @@ -51,7 +51,7 @@ ROSPack::run(int argc, char** argv) return 0; } -int +int ROSPack::run(const std::string& cmd) { // Callers of this method don't make 'rospack' argv[0]. @@ -60,7 +60,7 @@ ROSPack::run(const std::string& cmd) int argc; char** argv; std::vector full_cmd_split; - boost::split(full_cmd_split, full_cmd, + boost::split(full_cmd_split, full_cmd, boost::is_any_of(" "), boost::token_compress_on); argc = full_cmd_split.size(); @@ -81,7 +81,7 @@ ROSPack::run(const std::string& cmd) for(int i=0; i::iterator it = deps.begin(); while(it != deps.end()) { - if(std::find(disable_langs.begin(), disable_langs.end(), *it) != + if(std::find(disable_langs.begin(), disable_langs.end(), *it) != disable_langs.end()) it = deps.erase(it); else @@ -349,7 +349,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output return true; } // COMMAND: depends [package] (alias: deps) - else if(command == "depends" || command == "deps" || + else if(command == "depends" || command == "deps" || command == "depends1" || command == "deps1") { if(!package.size()) @@ -357,7 +357,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output rp.logError( "no package/stack given"); return false; } - if(target.size() || top.size() || length_str.size() || + if(target.size() || top.size() || length_str.size() || zombie_only || deps_only || lang.size() || attrib.size()) { rp.logError( "invalid option(s) given"); @@ -380,7 +380,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output rp.logError( "no package/stack given"); return false; } - if(target.size() || top.size() || length_str.size() || + if(target.size() || top.size() || length_str.size() || zombie_only || deps_only || lang.size() || attrib.size()) { rp.logError( "invalid option(s) given"); @@ -401,7 +401,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output return true; } // COMMAND: depends-msgsrv [package] (alias: deps-msgsrv) - else if(rp.getName() == ROSPACK_NAME && + else if(rp.getName() == ROSPACK_NAME && (command == "depends-msgsrv" || command == "deps-msgsrv")) { if(!package.size()) @@ -409,7 +409,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output rp.logError( "no package given"); return false; } - if(target.size() || top.size() || length_str.size() || + if(target.size() || top.size() || length_str.size() || zombie_only || deps_only || lang.size() || attrib.size()) { rp.logError( "invalid option(s) given"); @@ -437,7 +437,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output rp.logError( "no package/stack given"); return false; } - if(target.size() || top.size() || length_str.size() || + if(target.size() || top.size() || length_str.size() || zombie_only || deps_only || lang.size() || attrib.size()) { rp.logError( "invalid option(s) given"); @@ -460,7 +460,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output rp.logError( "no package/stack or target given"); return false; } - if(top.size() || length_str.size() || + if(top.size() || length_str.size() || zombie_only || deps_only || lang.size() || attrib.size()) { rp.logError( "invalid option(s) given"); @@ -474,7 +474,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output } // COMMAND: rosdep [package] (alias: rosdeps) // COMMAND: rosdep0 [package] (alias: rosdeps0) - else if(rp.getName() == ROSPACK_NAME && + else if(rp.getName() == ROSPACK_NAME && (command == "rosdep" || command == "rosdeps" || command == "rosdep0" || command == "rosdeps0")) { @@ -483,7 +483,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output rp.logError( "no package given"); return false; } - if(target.size() || top.size() || length_str.size() || + if(target.size() || top.size() || length_str.size() || zombie_only || deps_only || lang.size() || attrib.size()) { rp.logError( "invalid option(s) given"); @@ -500,7 +500,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output } // COMMAND: vcs [package] // COMMAND: vcs0 [package] - else if(rp.getName() == ROSPACK_NAME && + else if(rp.getName() == ROSPACK_NAME && (command == "vcs" || command == "vcs0")) { if(!package.size()) @@ -508,7 +508,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output rp.logError( "no package given"); return false; } - if(target.size() || top.size() || length_str.size() || + if(target.size() || top.size() || length_str.size() || zombie_only || deps_only || lang.size() || attrib.size()) { rp.logError( "invalid option(s) given"); @@ -532,7 +532,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output rp.logError( "no package/stack given"); return false; } - if(target.size() || top.size() || length_str.size() || + if(target.size() || top.size() || length_str.size() || zombie_only || deps_only || lang.size() || attrib.size()) { rp.logError( "invalid option(s) given"); @@ -780,7 +780,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output rp.logError( "no stack given"); return false; } - if(target.size() || top.size() || length_str.size() || + if(target.size() || top.size() || length_str.size() || zombie_only || deps_only || lang.size() || attrib.size()) { rp.logError( "invalid option(s) given"); @@ -796,7 +796,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output return true; } // COMMAND: contains [package] - else if(rp.getName() == ROSSTACK_NAME && + else if(rp.getName() == ROSSTACK_NAME && ((command == "contains") || (command == "contains-path"))) { if(!package.size()) @@ -804,7 +804,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output rp.logError( "no package given"); return false; } - if(target.size() || top.size() || length_str.size() || + if(target.size() || top.size() || length_str.size() || zombie_only || deps_only || lang.size() || attrib.size()) { rp.logError( "invalid option(s) given"); @@ -827,7 +827,7 @@ rospack_run(int argc, char** argv, rospack::Rosstackage& rp, std::string& output } bool -parse_args(int argc, char** argv, +parse_args(int argc, char** argv, rospack::Rosstackage& rp, po::variables_map& vm) { po::options_description desc("Allowed options"); diff --git a/src/rospack_cmdline.h b/src/rospack_cmdline.h index 56e6c77..3b19617 100644 --- a/src/rospack_cmdline.h +++ b/src/rospack_cmdline.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2008, Willow Garage, Inc. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright notice, @@ -35,7 +35,7 @@ namespace rospack { ROSPACK_DECL bool rospack_run(int argc, char** argv, - rospack::Rosstackage& rp, + rospack::Rosstackage& rp, std::string& output); } diff --git a/src/rospack_main.cpp b/src/rospack_main.cpp index d14612c..85fbacf 100644 --- a/src/rospack_main.cpp +++ b/src/rospack_main.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2008, Willow Garage, Inc. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright notice, diff --git a/src/rosstack_main.cpp b/src/rosstack_main.cpp index df9d086..b3746fc 100644 --- a/src/rosstack_main.cpp +++ b/src/rosstack_main.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2008, Willow Garage, Inc. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright notice, diff --git a/src/utils.cpp b/src/utils.cpp index af36c8a..97a557a 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2008, Willow Garage, Inc. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright notice, @@ -36,7 +36,7 @@ namespace rospack { void -deduplicate_tokens(const std::string& instring, +deduplicate_tokens(const std::string& instring, bool last, std::string& outstring) { @@ -72,7 +72,7 @@ deduplicate_tokens(const std::string& instring, } void -parse_compiler_flags(const std::string& instring, +parse_compiler_flags(const std::string& instring, const std::string& token, bool select, bool last, @@ -120,8 +120,8 @@ parse_compiler_flags(const std::string& instring, } } // Special case: if we're told to look for -l, then also find *.a - else if(it->size() > 2 && - (*it)[0] == '/' && + else if(it->size() > 2 && + (*it)[0] == '/' && it->substr(it->size()-2) == ".a") { if(select) diff --git a/src/utils.h b/src/utils.h index 02e1de1..485b00c 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2008, Willow Garage, Inc. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright notice, diff --git a/test/test/utest.cpp b/test/test/utest.cpp index b7e5a84..8b3b0dd 100644 --- a/test/test/utest.cpp +++ b/test/test/utest.cpp @@ -1,10 +1,10 @@ /* * Copyright (c) 2008, Willow Garage, Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: - * + * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright @@ -13,7 +13,7 @@ * * Neither the name of Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -60,7 +60,7 @@ TEST(rospack, reentrant) ASSERT_EQ((int)output_list.size(), 4); ret = rp.run(std::string("list")); ASSERT_EQ(ret, 0); - output = rp.getOutput(); + output = rp.getOutput(); boost::trim(output); boost::split(output_list, output, boost::is_any_of("\n")); ASSERT_EQ((int)output_list.size(), 4); @@ -80,13 +80,13 @@ TEST(rospack, multiple_rospack_objects) ret = rp.run(std::string("list-names")); ASSERT_EQ(ret, 0); std::vector output_list; - output = rp.getOutput(); + output = rp.getOutput(); boost::trim(output); boost::split(output_list, output, boost::is_any_of("\n")); ASSERT_EQ((int)output_list.size(), 4); ret = rp.run(std::string("list")); ASSERT_EQ(ret, 0); - output = rp.getOutput(); + output = rp.getOutput(); boost::trim(output); boost::split(output_list, output, boost::is_any_of("\n")); ASSERT_EQ((int)output_list.size(), 4); @@ -102,13 +102,13 @@ TEST(rospack, multiple_rospack_objects) ret = rp2.run(std::string("list-names")); ASSERT_EQ(ret, 0); output_list.clear(); - output = rp2.getOutput(); + output = rp2.getOutput(); boost::trim(output); boost::split(output_list, output, boost::is_any_of("\n")); ASSERT_EQ((int)output_list.size(), 4); ret = rp2.run(std::string("list")); ASSERT_EQ(ret, 0); - output = rp2.getOutput(); + output = rp2.getOutput(); boost::trim(output); boost::split(output_list, output, boost::is_any_of("\n")); ASSERT_EQ((int)output_list.size(), 4);