Compilation fixes for Windows - codecheck patches (part 1)

CMakeLists.txt

@@ -48,13 +48,13 @@ set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-transport
-ign_find_package(ignition-transport9 REQUIRED COMPONENTS log)
-set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})
+ign_find_package(ignition-transport10 REQUIRED COMPONENTS log)
+set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-msgs
-ign_find_package(ignition-msgs6 REQUIRED)
-set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR})
+ign_find_package(ignition-msgs7 REQUIRED)
+set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-common
@@ -124,13 +124,15 @@ set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
 
 #--------------------------------------
 # Find protobuf
+# Module is needed to use the PROTOBUF_GENERATE_CPP
+set(protobuf_MODULE_COMPATIBLE TRUE)
 set(REQ_PROTOBUF_VER 3)
 ign_find_package(IgnProtobuf
                  VERSION ${REQ_PROTOBUF_VER}
                  REQUIRED
                  COMPONENTS all
                  PRETTY Protobuf)
-set(PROTOBUF_IMPORT_DIRS ${ignition-msgs6_INCLUDE_DIRS})
+set(Protobuf_IMPORT_DIRS ${ignition-msgs7_INCLUDE_DIRS})
 
 # Plugin install dirs
 set(IGNITION_GAZEBO_PLUGIN_INSTALL_DIR

README.md

@@ -236,8 +236,8 @@ line is using symbolic links to each library's YAML file.
 mkdir ~/.ignition/tools/configs -p
 cd ~/.ignition/tools/configs/
 ln -s /usr/local/share/ignition/fuel4.yaml .
-ln -s /usr/local/share/ignition/transport9.yaml .
-ln -s /usr/local/share/ignition/transportlog9.yaml .
+ln -s /usr/local/share/ignition/transport10.yaml .
+ln -s /usr/local/share/ignition/transportlog10.yaml .
 ...
 export IGN_CONFIG_PATH=$HOME/.ignition/tools/configs
 ```

docker/Dockerfile.nightly

@@ -19,9 +19,9 @@ RUN apt-get update \
     libignition-physics3-dev \
     libignition-rendering5-dev \
     libignition-tools-dev \
-    libignition-transport9-dev \
+    libignition-transport10-dev \
     libignition-gui5-dev \
-    libignition-msgs6-dev \
+    libignition-msgs7-dev \
     libignition-sensors5-dev \
     libsdformat10-dev
 

examples/standalone/joy_to_twist/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(ignition-transport9 QUIET REQUIRED OPTIONAL_COMPONENTS log)
-set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})
+find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
+set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
 
 find_package(sdformat10 REQUIRED)
 set(SDF_VER ${sdformat10_VERSION_MAJOR})

examples/standalone/joystick/CMakeLists.txt

@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 # joystick currently works only on linux
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  find_package(ignition-transport9 QUIET REQUIRED OPTIONAL_COMPONENTS log)
-  set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})
+  find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
+  set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
 
   find_package(sdformat10 REQUIRED)
   set(SDF_VER ${sdformat10_VERSION_MAJOR})

examples/standalone/keyboard/CMakeLists.txt

@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  find_package(ignition-transport9 QUIET REQUIRED OPTIONAL_COMPONENTS log)
-  set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})
+  find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
+  set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
 
   find_package(sdformat10 REQUIRED)
   set(SDF_VER ${sdformat10_VERSION_MAJOR})
 
-  find_package(ignition-msgs6 REQUIRED)
-  set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR})
+  find_package(ignition-msgs7 REQUIRED)
+  set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})
 
   find_package(ignition-common3 REQUIRED)
   set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR})

examples/standalone/marker/CMakeLists.txt

@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  find_package(ignition-transport9 QUIET REQUIRED OPTIONAL_COMPONENTS log)
-  set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})
+  find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
+  set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
 
   find_package(ignition-common3 REQUIRED)
   set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR})
 
-  find_package(ignition-msgs6 REQUIRED)
-  set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR})
+  find_package(ignition-msgs7 REQUIRED)
+  set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})
 
   add_executable(marker marker.cc)
   target_link_libraries(marker

examples/standalone/scene_requester/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(ignition-transport9 QUIET REQUIRED OPTIONAL_COMPONENTS log)
-set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})
+find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
+set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
 
 add_executable(scene_requester scene_requester.cc)
 target_link_libraries(scene_requester

include/ignition/gazebo/EntityComponentManager.hh

@@ -22,6 +22,7 @@
 
 #include <map>
 #include <memory>
+#include <optional>
 #include <set>
 #include <string>
 #include <typeinfo>

include/ignition/gazebo/EventManager.hh

@@ -47,7 +47,7 @@ namespace ignition
     /// occur.
     ///
     /// See \ref ignition::gazebo::events for a complete list of events.
-    class IGNITION_GAZEBO_VISIBLE EventManager
+    class EventManager
     {
       /// \brief Constructor
       public: EventManager();

include/ignition/gazebo/Server.hh

@@ -19,6 +19,7 @@
 
 #include <cstdint>
 #include <memory>
+#include <optional>
 #include <string>
 #include <ignition/gazebo/config.hh>
 #include <ignition/gazebo/EntityComponentManager.hh>

include/ignition/gazebo/World.hh

@@ -18,6 +18,7 @@
 #define IGNITION_GAZEBO_WORLD_HH_
 
 #include <memory>
+#include <optional>
 #include <string>
 #include <vector>
 

include/ignition/gazebo/detail/EntityComponentManager.hh

@@ -19,6 +19,7 @@
 
 #include <cstring>
 #include <map>
+#include <optional>
 #include <set>
 #include <utility>
 #include <vector>

include/ignition/gazebo/gui/GuiRunner.hh

@@ -35,7 +35,7 @@ namespace gazebo
 inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 /// \brief Responsible for running GUI systems as new states are received from
 /// the backend.
-class IGNITION_GAZEBO_VISIBLE GuiRunner : public QObject
+class GuiRunner : public QObject
 {
   Q_OBJECT
 

include/ignition/gazebo/gui/GuiSystem.hh

@@ -41,7 +41,7 @@ namespace gazebo
   /// GUI systems are different from `ignition::gazebo::System`s because they
   /// don't run in the same process as the physics. Instead, they run in a
   /// separate process that is stepped by updates coming through the network
-  class IGNITION_GAZEBO_VISIBLE GuiSystem : public ignition::gui::Plugin
+  class GuiSystem : public ignition::gui::Plugin
   {
     Q_OBJECT
 

include/ignition/gazebo/gui/TmpIface.hh

@@ -36,7 +36,7 @@ namespace ignition
     /// Move API from here to their appropriate locations once that's known.
     ///
     /// This class should be removed before releasing!
-    class IGNITION_GAZEBO_VISIBLE TmpIface : public QObject
+    class TmpIface : public QObject
     {
       Q_OBJECT
 

src/CMakeLists.txt

@@ -85,6 +85,15 @@ set (gtest_sources
   network/NetworkManager_TEST.cc
 )
 
+if (MSVC)
+  # Warning #4251 is the "dll-interface" warning that tells you when types used
+  # by a class are not being exported. These generated source files have private
+  # members that don't get exported, so they trigger this warning. However, the
+  # warning is not important since those members do not need to be interfaced
+  # with.
+  set_source_files_properties(${sources} ${gtest_sources} COMPILE_FLAGS "/wd4251 /wd4146")
+endif()
+
 # Create the library target
 ign_create_core_library(SOURCES ${sources} CXX_STANDARD 17)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
@@ -101,7 +110,7 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PRIVATE
   ignition-plugin${IGN_PLUGIN_VER}::loader
 )
-if (NOT APPLE)
+if (UNIX AND NOT APPLE)
   target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
     PRIVATE stdc++fs)
 endif()

src/LevelManager.hh

@@ -74,7 +74,7 @@ namespace ignition
     ///   when the level is reloaded. Likewise, they should not be deleted.
     /// * Entities spawned during simulation are part of the default level.
     ///
-    class LevelManager
+    class IGNITION_GAZEBO_VISIBLE LevelManager
     {
       /// \brief Constructor
       /// \param[in] _runner A pointer to the simulationrunner that owns this

src/SdfGenerator.hh

@@ -20,6 +20,7 @@
 #include <ignition/msgs/sdf_generator_config.pb.h>
 
 #include <sdf/Element.hh>
+#include <optional>
 #include <string>
 #include <unordered_map>
 

src/Server.cc

@@ -15,6 +15,8 @@
  *
 */
 
+#include <numeric>
+
 #include <ignition/common/SystemPaths.hh>
 #include <ignition/fuel_tools/Interface.hh>
 #include <ignition/fuel_tools/ClientConfig.hh>

src/ServerPrivate.hh

@@ -23,6 +23,7 @@
 #include <condition_variable>
 #include <memory>
 #include <mutex>
+#include <optional>
 #include <string>
 #include <thread>
 #include <unordered_map>

src/Server_TEST.cc

@@ -48,8 +48,8 @@ class ServerFixture : public ::testing::TestWithParam<int>
   protected: void SetUp() override
   {
     // Augment the system plugin path.  In SetUp to avoid test order issues.
-    setenv("IGN_GAZEBO_SYSTEM_PLUGIN_PATH",
-           (std::string(PROJECT_BINARY_PATH) + "/lib").c_str(), 1);
+    ignition::common::setenv("IGN_GAZEBO_SYSTEM_PLUGIN_PATH",
+           (std::string(PROJECT_BINARY_PATH) + "/lib").c_str());
 
     ignition::common::Console::SetVerbosity(4);
   }
@@ -783,9 +783,9 @@ TEST_P(ServerFixture, Seed)
 /////////////////////////////////////////////////
 TEST_P(ServerFixture, ResourcePath)
 {
-  setenv("IGN_GAZEBO_RESOURCE_PATH",
+  ignition::common::setenv("IGN_GAZEBO_RESOURCE_PATH",
          (std::string(PROJECT_SOURCE_PATH) + "/test/worlds:" +
-          std::string(PROJECT_SOURCE_PATH) + "/test/worlds/models").c_str(), 1);
+          std::string(PROJECT_SOURCE_PATH) + "/test/worlds/models").c_str());
 
   ServerConfig serverConfig;
   serverConfig.SetSdfFile("resource_paths.sdf");
@@ -871,8 +871,8 @@ TEST_P(ServerFixture, ResourcePath)
 /////////////////////////////////////////////////
 TEST_P(ServerFixture, GetResourcePaths)
 {
-  setenv("IGN_GAZEBO_RESOURCE_PATH",
-      "/tmp/some/path:/home/user/another_path", 1);
+  ignition::common::setenv("IGN_GAZEBO_RESOURCE_PATH",
+      "/tmp/some/path:/home/user/another_path");
 
   ServerConfig serverConfig;
   gazebo::Server server(serverConfig);
@@ -903,7 +903,7 @@ TEST_P(ServerFixture, CachedFuelWorld)
 {
   auto cachedWorldPath =
     common::joinPaths(std::string(PROJECT_SOURCE_PATH), "test", "worlds");
-  setenv("IGN_FUEL_CACHE_PATH", cachedWorldPath.c_str(), 1);
+  ignition::common::setenv("IGN_FUEL_CACHE_PATH", cachedWorldPath.c_str());
 
   ServerConfig serverConfig;
   auto fuelWorldURL =
@@ -927,10 +927,10 @@ TEST_P(ServerFixture, CachedFuelWorld)
 /////////////////////////////////////////////////
 TEST_P(ServerFixture, AddResourcePaths)
 {
-  setenv("IGN_GAZEBO_RESOURCE_PATH",
-      "/tmp/some/path:/home/user/another_path", 1);
-  setenv("SDF_PATH", "", 1);
-  setenv("IGN_FILE_PATH", "", 1);
+  ignition::common::setenv("IGN_GAZEBO_RESOURCE_PATH",
+      "/tmp/some/path:/home/user/another_path");
+  ignition::common::setenv("SDF_PATH", "");
+  ignition::common::setenv("IGN_FILE_PATH", "");
 
   ServerConfig serverConfig;
   gazebo::Server server(serverConfig);
@@ -974,7 +974,7 @@ TEST_P(ServerFixture, AddResourcePaths)
   // Check environment variables
   for (auto env : {"IGN_GAZEBO_RESOURCE_PATH", "SDF_PATH", "IGN_FILE_PATH"})
   {
-    char *pathCStr = getenv(env);
+    char *pathCStr = std::getenv(env);
 
     auto paths = common::Split(pathCStr, ':');
     paths.erase(std::remove_if(paths.begin(), paths.end(),

src/SimulationRunner.hh

@@ -26,6 +26,7 @@
 #include <functional>
 #include <list>
 #include <memory>
+#include <optional>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>

src/SimulationRunner_TEST.cc

@@ -17,6 +17,7 @@
 
 #include <gtest/gtest.h>
 #include <ignition/common/Console.hh>
+#include <ignition/common/Util.hh>
 #include <ignition/transport/Node.hh>
 #include <sdf/Box.hh>
 #include <sdf/Cylinder.hh>
@@ -81,8 +82,8 @@ class SimulationRunnerTest : public ::testing::TestWithParam<int>
   {
     common::Console::SetVerbosity(4);
 
-    setenv("IGN_GAZEBO_SYSTEM_PLUGIN_PATH",
-      (std::string(PROJECT_BINARY_PATH) + "/lib").c_str(), 1);
+    ignition::common::setenv("IGN_GAZEBO_SYSTEM_PLUGIN_PATH",
+      (std::string(PROJECT_BINARY_PATH) + "/lib").c_str());
   }
 };