niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[windows] fix compiler errors and warnings

Browse source
This commit is contained in:
William Woodall 2015-03-12 02:00:54 -07:00 • committed by William Woodall
parent 5a03ec1d0e
commit 1e5b98f167
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rclcpp/include/rclcpp/executors/multi_threaded_executor.hpp
View file

@ -58,11 +58,11 @@ public:
std::vector<std::thread> threads; std::vector<std::thread> threads;
{ {
std::lock_guard<std::mutex> wait_lock(wait_mutex_); std::lock_guard<std::mutex> wait_lock(wait_mutex_);
size_t thread_id = 1; size_t thread_id_ = 1;
for (size_t i = number_of_threads_; i > 0; --i) for (size_t i = number_of_threads_; i > 0; --i)
{ {
std::this_thread::sleep_for(std::chrono::milliseconds(100)); std::this_thread::sleep_for(std::chrono::milliseconds(100));
auto func = std::bind(&MultiThreadedExecutor::run, this, thread_id++); auto func = std::bind(&MultiThreadedExecutor::run, this, thread_id_++);
threads.emplace_back(func); threads.emplace_back(func);
} }
} }

8
rclcpp/include/rclcpp/rclcpp.hpp
View file

@ -27,21 +27,21 @@
namespace rclcpp namespace rclcpp
{ {
constexpr std::chrono::seconds operator "" _s(unsigned long long s) const std::chrono::seconds operator "" _s(unsigned long long s)
{ {
return std::chrono::seconds(s); return std::chrono::seconds(s);
} }
constexpr std::chrono::duration<long double> operator "" _s(long double s) const std::chrono::duration<long double> operator "" _s(long double s)
{ {
return std::chrono::duration<long double>(s); return std::chrono::duration<long double>(s);
} }
constexpr std::chrono::nanoseconds const std::chrono::nanoseconds
operator "" _ns(unsigned long long ns) operator "" _ns(unsigned long long ns)
{ {
return std::chrono::nanoseconds(ns); return std::chrono::nanoseconds(ns);
} }
constexpr std::chrono::duration<long double, std::nano> const std::chrono::duration<long double, std::nano>
operator "" _ns(long double ns) operator "" _ns(long double ns)
{ {
return std::chrono::duration<long double, std::nano>(ns); return std::chrono::duration<long double, std::nano>(ns);