From e2f02029cf28f5dfb2fd6f01fc76f728c0c2f6da Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Fri, 3 Mar 2023 12:17:17 -0600 Subject: [PATCH 1/2] Address a few Windows CI Issues (#1911) Signed-off-by: Michael Carroll Signed-off-by: Michael Carroll --- include/gz/sim/detail/EntityComponentManager.hh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/gz/sim/detail/EntityComponentManager.hh b/include/gz/sim/detail/EntityComponentManager.hh index a5cf6379f6..785cfb3ab4 100644 --- a/include/gz/sim/detail/EntityComponentManager.hh +++ b/include/gz/sim/detail/EntityComponentManager.hh @@ -52,11 +52,18 @@ namespace traits template struct HasEqualityOperator { +#if !defined(_MSC_VER) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnonnull" +#endif enum { // False positive codecheck "Using C-style cast" value = !std::is_same::value // NOLINT }; +#if !defined(_MSC_VER) +#pragma GCC diagnostic pop +#endif }; } From 727bbf0be118e23e7c1880da387a3c9dd3d57f2f Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Tue, 21 Nov 2023 19:53:13 -0600 Subject: [PATCH 2/2] Fix DLL linkage/visibility issues (#2254) Signed-off-by: Michael Carroll --- src/CMakeLists.txt | 3 +-- src/cmd/runGui_main.cc | 23 +++++++++++++++++++ src/gz.cc | 5 ---- .../CameraVideoRecorder.cc | 1 - 4 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 src/cmd/runGui_main.cc diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8a81a7583d..969da19349 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -68,7 +68,6 @@ set (sources Util.cc View.cc World.cc - cmd/ModelCommandAPI.cc ${PROTO_PRIVATE_SRC} ${network_sources} ${comms_sources} @@ -160,7 +159,7 @@ target_link_libraries(${ign_lib_target} ) # Executable target that runs the GUI without ruby for debugging purposes. -add_executable(runGui gz.cc) +add_executable(runGui cmd/runGui_main.cc) target_link_libraries(runGui PRIVATE ${ign_lib_target}) # Create the library target diff --git a/src/cmd/runGui_main.cc b/src/cmd/runGui_main.cc new file mode 100644 index 0000000000..0b8aa66d4d --- /dev/null +++ b/src/cmd/runGui_main.cc @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2023 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * +*/ + +#include "gz/sim/gui/Gui.hh" + +int main(int argc, char* argv[]) +{ + return gz::sim::gui::runGui(argc, argv, nullptr); +} diff --git a/src/gz.cc b/src/gz.cc index a658d2eb34..206d88e4d4 100644 --- a/src/gz.cc +++ b/src/gz.cc @@ -429,8 +429,3 @@ extern "C" int runGui(const char *_guiConfig, const char *_file, int _waitGui, return gz::sim::gui::runGui( argc, &argv, _guiConfig, _file, _waitGui, _renderEngine); } - -int main(int argc, char* argv[]) -{ - return gazebo::gui::runGui(argc, argv, nullptr); -} diff --git a/src/systems/camera_video_recorder/CameraVideoRecorder.cc b/src/systems/camera_video_recorder/CameraVideoRecorder.cc index dcfe5f13e9..2913fe1d97 100644 --- a/src/systems/camera_video_recorder/CameraVideoRecorder.cc +++ b/src/systems/camera_video_recorder/CameraVideoRecorder.cc @@ -333,7 +333,6 @@ void CameraVideoRecorderPrivate::OnPostRender() { this->camera->Copy(this->cameraImage); std::chrono::steady_clock::time_point t; - std::chrono::steady_clock::now(); if (this->recordVideoUseSimTime) t = std::chrono::steady_clock::time_point(this->simTime); else