Skip to content

Commit

Permalink
Migrate sources in src, test, examples, and include
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
methylDragon committed Apr 28, 2022
1 parent 4efc63a commit c489f8d
Show file tree
Hide file tree
Showing 27 changed files with 97 additions and 97 deletions.
6 changes: 3 additions & 3 deletions core/include/gz/plugin/EnablePluginFromThis.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*
*/

#ifndef IGNITION_PLUGIN_ENABLEPLUGINFROMTHIS_HH_
#define IGNITION_PLUGIN_ENABLEPLUGINFROMTHIS_HH_
#ifndef GZ_PLUGIN_ENABLEPLUGINFROMTHIS_HH_
#define GZ_PLUGIN_ENABLEPLUGINFROMTHIS_HH_

#include <memory>

#include <ignition/plugin/PluginPtr.hh>
#include <gz/plugin/PluginPtr.hh>

namespace ignition
{
Expand Down
8 changes: 4 additions & 4 deletions core/include/gz/plugin/Factory.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
*
*/

#ifndef IGNITION_PLUGIN_FACTORY_HH_
#define IGNITION_PLUGIN_FACTORY_HH_
#ifndef GZ_PLUGIN_FACTORY_HH_
#define GZ_PLUGIN_FACTORY_HH_

#include <chrono>
#include <functional>
#include <memory>
#include <tuple>

#include <ignition/plugin/EnablePluginFromThis.hh>
#include <gz/plugin/EnablePluginFromThis.hh>

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

#include <ignition/plugin/detail/Factory.hh>
#include <gz/plugin/detail/Factory.hh>

#endif
8 changes: 4 additions & 4 deletions core/include/gz/plugin/Info.hh
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
*/


#ifndef IGNITION_PLUGIN_INFO_HH_
#define IGNITION_PLUGIN_INFO_HH_
#ifndef GZ_PLUGIN_INFO_HH_
#define GZ_PLUGIN_INFO_HH_

#include <functional>
#include <memory>
#include <set>
#include <string>
#include <unordered_map>

#include <ignition/utils/SuppressWarning.hh>
#include <gz/utils/SuppressWarning.hh>

#include <ignition/plugin/Export.hh>
#include <gz/plugin/Export.hh>

namespace ignition
{
Expand Down
12 changes: 6 additions & 6 deletions core/include/gz/plugin/Plugin.hh
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
*/


#ifndef IGNITION_PLUGIN_PLUGIN_HH_
#define IGNITION_PLUGIN_PLUGIN_HH_
#ifndef GZ_PLUGIN_PLUGIN_HH_
#define GZ_PLUGIN_PLUGIN_HH_

#include <memory>
#include <map>
#include <string>

#include <ignition/utils/SuppressWarning.hh>
#include <gz/utils/SuppressWarning.hh>

#include <ignition/plugin/Export.hh>
#include <ignition/plugin/Info.hh>
#include <gz/plugin/Export.hh>
#include <gz/plugin/Info.hh>

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

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

#endif
8 changes: 4 additions & 4 deletions core/include/gz/plugin/PluginPtr.hh
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
*/


#ifndef IGNITION_PLUGIN_PLUGINPTR_HH_
#define IGNITION_PLUGIN_PLUGINPTR_HH_
#ifndef GZ_PLUGIN_PLUGINPTR_HH_
#define GZ_PLUGIN_PLUGINPTR_HH_

#include <map>
#include <string>
#include <memory>

#include <ignition/plugin/Plugin.hh>
#include <gz/plugin/Plugin.hh>

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

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

#endif
8 changes: 4 additions & 4 deletions core/include/gz/plugin/SpecializedPlugin.hh
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
*/


#ifndef IGNITION_PLUGIN_SPECIALIZEDPLUGIN_HH_
#define IGNITION_PLUGIN_SPECIALIZEDPLUGIN_HH_
#ifndef GZ_PLUGIN_SPECIALIZEDPLUGIN_HH_
#define GZ_PLUGIN_SPECIALIZEDPLUGIN_HH_

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

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

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

#endif
8 changes: 4 additions & 4 deletions core/include/gz/plugin/SpecializedPluginPtr.hh
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
*/


#ifndef IGNITION_PLUGIN_SPECIALIZEDPLUGINPTR_HH_
#define IGNITION_PLUGIN_SPECIALIZEDPLUGINPTR_HH_
#ifndef GZ_PLUGIN_SPECIALIZEDPLUGINPTR_HH_
#define GZ_PLUGIN_SPECIALIZEDPLUGINPTR_HH_

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

namespace ignition
{
Expand Down
6 changes: 3 additions & 3 deletions core/include/gz/plugin/WeakPluginPtr.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*
*/

#ifndef IGNITION_PLUGIN_WEAKPLUGINPTR_HH_
#define IGNITION_PLUGIN_WEAKPLUGINPTR_HH_
#ifndef GZ_PLUGIN_WEAKPLUGINPTR_HH_
#define GZ_PLUGIN_WEAKPLUGINPTR_HH_

#include <memory>

#include <ignition/plugin/PluginPtr.hh>
#include <gz/plugin/PluginPtr.hh>

namespace ignition
{
Expand Down
8 changes: 4 additions & 4 deletions core/include/gz/plugin/detail/Factory.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
*
*/

#ifndef IGNITION_PLUGIN_DETAIL_FACTORY_HH_
#define IGNITION_PLUGIN_DETAIL_FACTORY_HH_
#ifndef GZ_PLUGIN_DETAIL_FACTORY_HH_
#define GZ_PLUGIN_DETAIL_FACTORY_HH_

#include <memory>
#include <utility>

#include <ignition/utils/SuppressWarning.hh>
#include <gz/utils/SuppressWarning.hh>

#include <ignition/plugin/Factory.hh>
#include <gz/plugin/Factory.hh>

namespace ignition
{
Expand Down
6 changes: 3 additions & 3 deletions core/include/gz/plugin/detail/Plugin.hh
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
*/


#ifndef IGNITION_PLUGIN_DETAIL_PLUGIN_HH_
#define IGNITION_PLUGIN_DETAIL_PLUGIN_HH_
#ifndef GZ_PLUGIN_DETAIL_PLUGIN_HH_
#define GZ_PLUGIN_DETAIL_PLUGIN_HH_

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

namespace ignition
{
Expand Down
8 changes: 4 additions & 4 deletions core/include/gz/plugin/detail/PluginPtr.hh
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
*/


#ifndef IGNITION_PLUGIN_DETAIL_PLUGINPTR_HH_
#define IGNITION_PLUGIN_DETAIL_PLUGINPTR_HH_
#ifndef GZ_PLUGIN_DETAIL_PLUGINPTR_HH_
#define GZ_PLUGIN_DETAIL_PLUGINPTR_HH_

#include <memory>
#include <utility>
#include <ignition/plugin/PluginPtr.hh>
#include <ignition/plugin/utility.hh>
#include <gz/plugin/PluginPtr.hh>
#include <gz/plugin/utility.hh>

namespace ignition
{
Expand Down
6 changes: 3 additions & 3 deletions core/include/gz/plugin/detail/SpecializedPlugin.hh
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
*/


#ifndef IGNITION_PLUGIN_DETAIL_SPECIALIZEDPLUGIN_HH_
#define IGNITION_PLUGIN_DETAIL_SPECIALIZEDPLUGIN_HH_
#ifndef GZ_PLUGIN_DETAIL_SPECIALIZEDPLUGIN_HH_
#define GZ_PLUGIN_DETAIL_SPECIALIZEDPLUGIN_HH_

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

// This preprocessor token should only be used by the unittest that is
// responsible for checking that the specialized routines are being used to
Expand Down
4 changes: 2 additions & 2 deletions core/include/gz/plugin/detail/utility.hh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*/


#ifndef IGNITION_PLUGIN_DETAIL_UTILITY_HH_
#define IGNITION_PLUGIN_DETAIL_UTILITY_HH_
#ifndef GZ_PLUGIN_DETAIL_UTILITY_HH_
#define GZ_PLUGIN_DETAIL_UTILITY_HH_


#include <type_traits>
Expand Down
8 changes: 4 additions & 4 deletions core/include/gz/plugin/utility.hh
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
*/


#ifndef IGNITION_PLUGIN_UTILITY_HH_
#define IGNITION_PLUGIN_UTILITY_HH_
#ifndef GZ_PLUGIN_UTILITY_HH_
#define GZ_PLUGIN_UTILITY_HH_

#include <string>

#include <ignition/plugin/detail/utility.hh>
#include <ignition/plugin/Export.hh>
#include <gz/plugin/detail/utility.hh>
#include <gz/plugin/Export.hh>

namespace ignition
{
Expand Down
4 changes: 2 additions & 2 deletions examples/integrators.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include <cmath>
#include <set>

#include <ignition/plugin/Loader.hh>
#include <ignition/common/SystemPaths.hh>
#include <gz/plugin/Loader.hh>
#include <gz/common/SystemPaths.hh>

#include "plugins/integrators.hh"

Expand Down
2 changes: 1 addition & 1 deletion examples/plugins/ExponentialODE.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <cmath>

#include <ignition/plugin/Register.hh>
#include <gz/plugin/Register.hh>

#include "integrators.hh"

Expand Down
2 changes: 1 addition & 1 deletion examples/plugins/ForwardEuler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <cassert>

#include <ignition/plugin/Register.hh>
#include <gz/plugin/Register.hh>

#include "integrators.hh"

Expand Down
2 changes: 1 addition & 1 deletion examples/plugins/PolynomialODE.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <cmath>

#include <ignition/plugin/Register.hh>
#include <gz/plugin/Register.hh>

#include "integrators.hh"

Expand Down
2 changes: 1 addition & 1 deletion examples/plugins/RungeKutta4.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <cassert>

#include <ignition/plugin/Register.hh>
#include <gz/plugin/Register.hh>

#include "integrators.hh"

Expand Down
4 changes: 2 additions & 2 deletions examples/plugins/integrators.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*
*/

#ifndef IGNITION_PLUGIN_EXAMPLES_PLUGINS_INTEGRATORS_HH_
#define IGNITION_PLUGIN_EXAMPLES_PLUGINS_INTEGRATORS_HH_
#ifndef GZ_PLUGIN_EXAMPLES_PLUGINS_INTEGRATORS_HH_
#define GZ_PLUGIN_EXAMPLES_PLUGINS_INTEGRATORS_HH_

#include <vector>
#include <functional>
Expand Down
10 changes: 5 additions & 5 deletions examples/plugins/robot.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
*
*/

#ifndef IGNITION_PLUGIN_EXAMPLES_PLUGINS_ROBOT_HH_
#define IGNITION_PLUGIN_EXAMPLES_PLUGINS_ROBOT_HH_
#ifndef GZ_PLUGIN_EXAMPLES_PLUGINS_ROBOT_HH_
#define GZ_PLUGIN_EXAMPLES_PLUGINS_ROBOT_HH_

#include <utility>

#include <ignition/math/Vector2.hh>
#include <ignition/math/Vector3.hh>
#include <gz/math/Vector2.hh>
#include <gz/math/Vector3.hh>

#include <ignition/plugin/Register.hh>
#include <gz/plugin/Register.hh>

namespace ignition
{
Expand Down
6 changes: 3 additions & 3 deletions examples/robot.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

#include "plugins/robot.hh"

#include <ignition/common/SystemPaths.hh>
#include <ignition/plugin/SpecializedPluginPtr.hh>
#include <ignition/plugin/Loader.hh>
#include <gz/common/SystemPaths.hh>
#include <gz/plugin/SpecializedPluginPtr.hh>
#include <gz/plugin/Loader.hh>

#ifdef HAVE_BOOST_PROGRAM_OPTIONS
#include <boost/program_options.hpp>
Expand Down
Loading

0 comments on commit c489f8d

Please sign in to comment.