mirrors/scout_ros
1
0
Fork 0
mirror of https://github.com/westonrobot/scout_ros.git synced 2026-01-12 11:20:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed asio warning, enabled C++11 in scout_webots_sim package

Browse Source
This commit is contained in:
Ruixiang Du
2020-03-05 21:12:40 +08:00
parent 0ccec5d4ba
commit 87e2db8813
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scout_sdk/include/scout_sdk/async_io/async_can.hpp
View File

@@ -36,8 +36,13 @@
#include <functional> #include <functional>
#include <iostream> #include <iostream>
#define ASIO_ENABLE_OLD_SERVICES #ifndef ASIO_ENABLE_OLD_SERVICES
#define ASIO_ENABLE_OLD_SERVICES
#endif
#ifndef ASIO_HAS_POSIX_STREAM_DESCRIPTOR
#define ASIO_HAS_POSIX_STREAM_DESCRIPTOR #define ASIO_HAS_POSIX_STREAM_DESCRIPTOR
#endif
#include "asio.hpp" #include "asio.hpp"
#include "asio/posix/basic_stream_descriptor.hpp" #include "asio/posix/basic_stream_descriptor.hpp"

7
scout_sdk/include/scout_sdk/async_io/async_serial.hpp
View File

@@ -38,8 +38,13 @@
#include <deque> #include <deque>
#include <functional> #include <functional>
#define ASIO_ENABLE_OLD_SERVICES #ifndef ASIO_ENABLE_OLD_SERVICES
#define ASIO_ENABLE_OLD_SERVICES
#endif
#ifndef ASIO_HAS_POSIX_STREAM_DESCRIPTOR
#define ASIO_HAS_POSIX_STREAM_DESCRIPTOR #define ASIO_HAS_POSIX_STREAM_DESCRIPTOR
#endif
#include "asio.hpp" #include "asio.hpp"

2
scout_webots_sim/CMakeLists.txt
View File

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3)
project(scout_webots_sim) project(scout_webots_sim)
## Compile as C++11, supported in ROS Kinetic and newer ## Compile as C++11, supported in ROS Kinetic and newer
# add_compile_options(-std=c++11) add_compile_options(-std=c++11)
## Find catkin macros and libraries ## Find catkin macros and libraries
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)