From c143c412f99b93c18da1a2e47383646b86414893 Mon Sep 17 00:00:00 2001 From: Sai Vemprala Date: Thu, 7 May 2020 15:16:34 -0700 Subject: [PATCH 1/2] Reduced warning level in Unity build --- Unity/AirLibWrapper/AirsimWrapper/cmake/rpc-setup.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Unity/AirLibWrapper/AirsimWrapper/cmake/rpc-setup.cmake b/Unity/AirLibWrapper/AirsimWrapper/cmake/rpc-setup.cmake index 5a5723be44..b52ff479fc 100644 --- a/Unity/AirLibWrapper/AirsimWrapper/cmake/rpc-setup.cmake +++ b/Unity/AirLibWrapper/AirsimWrapper/cmake/rpc-setup.cmake @@ -125,7 +125,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # clang is the compiler used for developing mainly, so # this is where I set the highest warning level list(APPEND RPCLIB_BUILD_FLAGS - -Wall -pedantic -Weverything -Wno-c++98-compat + -Wall -Wextra -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Wno-missing-prototypes -Wno-undef -pthread) From f436ae43df94a0a9775e5c0f2e83d12dc1d113d7 Mon Sep 17 00:00:00 2001 From: Rajat Singhal Date: Sat, 9 May 2020 01:27:26 +0530 Subject: [PATCH 2/2] Pr/2672 (#1) * [Unity] Reduce build warnings Change -Weverything to -Wextra * [Travis] Simplify Unity build command * [Unity] Fix missing override warnings --- .travis.yml | 4 ++-- .../Source/Vehicles/Multirotor/SimModeWorldMultiRotor.h | 2 +- Unity/AirLibWrapper/AirsimWrapper/Source/WorldSimApi.h | 2 +- Unity/AirLibWrapper/AirsimWrapper/cmake/rpc-setup.cmake | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6317ec198b..153198042d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ script: ./setup.sh; ./build.sh || travis_terminate 1; echo "Starting Unity Build!"; - cd Unity && ./build.sh 2> Unity_error.txt || ((cat Unity_error.txt | grep -i "error:" -B 10 -A 10) && exit 1); + cd Unity && ./build.sh || travis_terminate 1; elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then export PATH=$MSBUILD_PATH:$PATH_FIX:$PATH; cmd.exe //C 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat' amd64 '&&' @@ -54,5 +54,5 @@ script: ./setup.sh; ./build.sh || travis_terminate 1; echo "Starting Unity Build!"; - cd Unity && ./build.sh 2> Unity_error.txt || ((cat Unity_error.txt | grep -i "error:" -B 10 -A 10) && exit 1); + cd Unity && ./build.sh || travis_terminate 1; fi diff --git a/Unity/AirLibWrapper/AirsimWrapper/Source/Vehicles/Multirotor/SimModeWorldMultiRotor.h b/Unity/AirLibWrapper/AirsimWrapper/Source/Vehicles/Multirotor/SimModeWorldMultiRotor.h index 1a9f86d64d..090b303b8e 100644 --- a/Unity/AirLibWrapper/AirsimWrapper/Source/Vehicles/Multirotor/SimModeWorldMultiRotor.h +++ b/Unity/AirLibWrapper/AirsimWrapper/Source/Vehicles/Multirotor/SimModeWorldMultiRotor.h @@ -19,7 +19,7 @@ class SimModeWorldMultiRotor : public SimModeWorldBase virtual void BeginPlay() override; virtual void EndPlay() override; void Tick(float DeltaSeconds) override; - UnityPawn* GetVehiclePawn(); + UnityPawn* GetVehiclePawn() override; private: typedef FlyingPawn TVehiclePawn; diff --git a/Unity/AirLibWrapper/AirsimWrapper/Source/WorldSimApi.h b/Unity/AirLibWrapper/AirsimWrapper/Source/WorldSimApi.h index 0acf3f26f0..697a30e1b1 100644 --- a/Unity/AirLibWrapper/AirsimWrapper/Source/WorldSimApi.h +++ b/Unity/AirLibWrapper/AirsimWrapper/Source/WorldSimApi.h @@ -18,7 +18,7 @@ class WorldSimApi : public msr::airlib::WorldSimApiBase virtual void pause(bool is_paused) override; virtual void continueForTime(double seconds) override; virtual void setTimeOfDay(bool is_enabled, const std::string& start_datetime, bool is_start_datetime_dst, - float celestial_clock_speed, float update_interval_secs, bool move_sun); + float celestial_clock_speed, float update_interval_secs, bool move_sun) override; virtual void enableWeather(bool enable) override; virtual void setWeatherParameter(WeatherParameter param, float val) override; diff --git a/Unity/AirLibWrapper/AirsimWrapper/cmake/rpc-setup.cmake b/Unity/AirLibWrapper/AirsimWrapper/cmake/rpc-setup.cmake index b52ff479fc..e1de801535 100644 --- a/Unity/AirLibWrapper/AirsimWrapper/cmake/rpc-setup.cmake +++ b/Unity/AirLibWrapper/AirsimWrapper/cmake/rpc-setup.cmake @@ -268,7 +268,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # clang is the compiler used for developing mainly, so # this is where I set the highest warning level list(APPEND RPCLIB_BUILD_FLAGS - -Wall -pedantic -Weverything -Wno-c++98-compat + -Wall -Wextra -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Wno-missing-prototypes -Wno-undef -pthread)