windows compilation

Signed-off-by: Ashton Larkin <[email protected]>
gazebosim · Mar 2, 2021 · f8fef92 · f8fef92
1 parent c0f7566
commit f8fef92
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/gui/plugins/plotting/Plotting.cc b/src/gui/plugins/plotting/Plotting.cc
@@ -18,6 +18,7 @@
 #include "Plotting.hh"
 
 #include <ignition/plugin/Register.hh>
+
 #include "ignition/gazebo/components/AngularAcceleration.hh"
 #include "ignition/gazebo/components/AngularVelocity.hh"
 #include "ignition/gazebo/components/CastShadows.hh"
@@ -232,7 +233,7 @@ void Plotting::SetData(std::string _Id, const ignition::math::Vector3d &_vector)
  this->dataPtr->components[_Id]->SetAttributeValue("z", _vector.Z());
 }
 
-void Plotting::SetData(std::string _Id, const msgs::Light &_light)
+void Plotting::SetData(std::string _Id, const ignition::msgs::Light &_light)
 {
  if (_light.has_specular())
  {
@@ -482,7 +483,8 @@ void Plotting ::Update(const ignition::gazebo::UpdateInfo &_info,
  auto comp = _ecm.Component<components::Light>(entity);
  if (comp)
  {
- msgs::Light lightMsgs = convert<msgs::Light>(comp->Data());
+ ignition::msgs::Light lightMsgs =
+ convert<ignition::msgs::Light>(comp->Data());
  this->SetData(component.first, lightMsgs);
  }
  }

diff --git a/test/integration/particle_emitter.cc b/test/integration/particle_emitter.cc
@@ -19,6 +19,8 @@
 
 #include <string>
 
+#include <ignition/common/Util.hh>
+
 #include <ignition/math/Color.hh>
 #include <ignition/msgs/Utility.hh>
 
@@ -41,8 +43,8 @@ class ParticleEmitterTest : public ::testing::Test
  protected: void SetUp() override
  {
  ignition::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());
  }
  public: void LoadWorld(const std::string &_path, bool _useLevels = false)
  {