Skip to content

Commit

Permalink
Use ignition headers for plugin (#350)
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <[email protected]>
  • Loading branch information
chapulina committed May 26, 2022
1 parent 57132ad commit d985e69
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion include/ignition/common/Plugin.hh
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,6 @@ namespace ignition
}
}

#include "gz/common/detail/Plugin.hh"
#include "ignition/common/detail/Plugin.hh"

#endif
4 changes: 2 additions & 2 deletions include/ignition/common/PluginLoader.hh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <unordered_set>

#include <gz/common/Export.hh>
#include <gz/common/PluginPtr.hh>
#include <ignition/common/PluginPtr.hh>
#include <gz/utils/SuppressWarning.hh>

namespace ignition
Expand Down Expand Up @@ -99,6 +99,6 @@ namespace ignition
}
}

#include "gz/common/detail/PluginLoader.hh"
#include "ignition/common/detail/PluginLoader.hh"

#endif
2 changes: 1 addition & 1 deletion include/ignition/common/PluginMacros.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#ifndef GZ_COMMON_REGISTERMACROS_HH_
#define GZ_COMMON_REGISTERMACROS_HH_

#include "gz/common/detail/PluginMacros.hh"
#include "ignition/common/detail/PluginMacros.hh"

// --------------- Specialize a plugin interface (optional) -------------------

Expand Down
4 changes: 2 additions & 2 deletions include/ignition/common/PluginPtr.hh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <string>
#include <memory>

#include "gz/common/Plugin.hh"
#include "ignition/common/Plugin.hh"

namespace ignition
{
Expand Down Expand Up @@ -226,6 +226,6 @@ namespace ignition
}
}

#include "gz/common/detail/PluginPtr.hh"
#include "ignition/common/detail/PluginPtr.hh"

#endif
6 changes: 3 additions & 3 deletions include/ignition/common/SpecializedPlugin.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <memory>

#include "gz/common/Plugin.hh"
#include "ignition/common/Plugin.hh"

namespace ignition
{
Expand Down Expand Up @@ -62,7 +62,7 @@ namespace ignition
/// Only interfaces that have been "specialized" can be passed as arguments
/// to the SpecializedPlugin template. To specialize an interface, simply
/// put the macro IGN_COMMON_SPECIALIZE_INTERFACE(~) from
/// gz/common/PluginMacros.hh into a public location of its class
/// ignition/common/PluginMacros.hh into a public location of its class
/// definition.
template <class SpecInterface>
class SpecializedPlugin<SpecInterface> : public virtual Plugin
Expand Down Expand Up @@ -165,6 +165,6 @@ namespace ignition
}
}

#include "gz/common/detail/SpecializedPlugin.hh"
#include "ignition/common/detail/SpecializedPlugin.hh"

#endif
6 changes: 3 additions & 3 deletions include/ignition/common/SpecializedPluginPtr.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#ifndef GZ_COMMON_SPECIALIZEDPLUGINPTR_HH_
#define GZ_COMMON_SPECIALIZEDPLUGINPTR_HH_

#include "gz/common/PluginPtr.hh"
#include "gz/common/SpecializedPlugin.hh"
#include "ignition/common/PluginPtr.hh"
#include "ignition/common/SpecializedPlugin.hh"

namespace ignition
{
Expand Down Expand Up @@ -64,7 +64,7 @@ namespace ignition
/// Only interfaces that have been "specialized" can be passed as arguments
/// to the SpecializedPluginPtr template. To specialize an interface, simply
/// put the macro IGN_COMMON_SPECIALIZE_INTERFACE(~) from
/// gz/common/PluginMacros.hh into a public location of its class
/// ignition/common/PluginMacros.hh into a public location of its class
/// definition.
template <typename... SpecInterfaces>
using SpecializedPluginPtr =
Expand Down
2 changes: 1 addition & 1 deletion include/ignition/common/detail/Plugin.hh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include <memory>
#include <string>
#include "gz/common/Plugin.hh"
#include "ignition/common/Plugin.hh"

namespace ignition
{
Expand Down
2 changes: 1 addition & 1 deletion include/ignition/common/detail/PluginLoader.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#define GZ_COMMON_DETAIL_PLUGINLOADER_HH_

#include <string>
#include "gz/common/PluginLoader.hh"
#include "ignition/common/PluginLoader.hh"

namespace ignition
{
Expand Down
2 changes: 1 addition & 1 deletion include/ignition/common/detail/PluginMacros.hh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <type_traits>
#include <unordered_set>
#include <utility>
#include "gz/common/PluginInfo.hh"
#include "ignition/common/PluginInfo.hh"
#include "gz/utils/SuppressWarning.hh"


Expand Down
2 changes: 1 addition & 1 deletion include/ignition/common/detail/PluginPtr.hh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <memory>
#include <utility>

#include "gz/common/PluginPtr.hh"
#include "ignition/common/PluginPtr.hh"
#include "gz/common/TemplateHelpers.hh"

namespace ignition
Expand Down
2 changes: 1 addition & 1 deletion include/ignition/common/detail/SpecializedPlugin.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#ifndef GZ_COMMON_DETAIL_SPECIALIZEDPLUGIN_HH_
#define GZ_COMMON_DETAIL_SPECIALIZEDPLUGIN_HH_

#include "gz/common/SpecializedPlugin.hh"
#include "ignition/common/SpecializedPlugin.hh"
#include <memory>

// This preprocessor token should only be used by the unittest that is
Expand Down

0 comments on commit d985e69

Please sign in to comment.