From 57f626e17c67a112be9738d77301371c1d5f4e4f Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 28 Apr 2022 15:06:37 -0700 Subject: [PATCH 1/4] Move header files with git mv Signed-off-by: methylDragon --- core/include/{ignition => gz}/plugin/CMakeLists.txt | 0 core/include/{ignition => gz}/plugin/EnablePluginFromThis.hh | 0 core/include/{ignition => gz}/plugin/Factory.hh | 0 core/include/{ignition => gz}/plugin/Info.hh | 0 core/include/{ignition => gz}/plugin/Plugin.hh | 0 core/include/{ignition => gz}/plugin/PluginPtr.hh | 0 core/include/{ignition => gz}/plugin/SpecializedPlugin.hh | 0 core/include/{ignition => gz}/plugin/SpecializedPluginPtr.hh | 0 core/include/{ignition => gz}/plugin/WeakPluginPtr.hh | 0 core/include/{ignition => gz}/plugin/config.hh.in | 0 core/include/{ignition => gz}/plugin/detail/Factory.hh | 0 core/include/{ignition => gz}/plugin/detail/Plugin.hh | 0 core/include/{ignition => gz}/plugin/detail/PluginPtr.hh | 0 core/include/{ignition => gz}/plugin/detail/SpecializedPlugin.hh | 0 core/include/{ignition => gz}/plugin/detail/utility.hh | 0 core/include/{ignition => gz}/plugin/utility.hh | 0 loader/include/{ignition => gz}/plugin/Loader.hh | 0 loader/include/{ignition => gz}/plugin/detail/Loader.hh | 0 register/include/{ignition => gz}/plugin/Register.hh | 0 register/include/{ignition => gz}/plugin/RegisterMore.hh | 0 register/include/{ignition => gz}/plugin/detail/Register.hh | 0 21 files changed, 0 insertions(+), 0 deletions(-) rename core/include/{ignition => gz}/plugin/CMakeLists.txt (100%) rename core/include/{ignition => gz}/plugin/EnablePluginFromThis.hh (100%) rename core/include/{ignition => gz}/plugin/Factory.hh (100%) rename core/include/{ignition => gz}/plugin/Info.hh (100%) rename core/include/{ignition => gz}/plugin/Plugin.hh (100%) rename core/include/{ignition => gz}/plugin/PluginPtr.hh (100%) rename core/include/{ignition => gz}/plugin/SpecializedPlugin.hh (100%) rename core/include/{ignition => gz}/plugin/SpecializedPluginPtr.hh (100%) rename core/include/{ignition => gz}/plugin/WeakPluginPtr.hh (100%) rename core/include/{ignition => gz}/plugin/config.hh.in (100%) rename core/include/{ignition => gz}/plugin/detail/Factory.hh (100%) rename core/include/{ignition => gz}/plugin/detail/Plugin.hh (100%) rename core/include/{ignition => gz}/plugin/detail/PluginPtr.hh (100%) rename core/include/{ignition => gz}/plugin/detail/SpecializedPlugin.hh (100%) rename core/include/{ignition => gz}/plugin/detail/utility.hh (100%) rename core/include/{ignition => gz}/plugin/utility.hh (100%) rename loader/include/{ignition => gz}/plugin/Loader.hh (100%) rename loader/include/{ignition => gz}/plugin/detail/Loader.hh (100%) rename register/include/{ignition => gz}/plugin/Register.hh (100%) rename register/include/{ignition => gz}/plugin/RegisterMore.hh (100%) rename register/include/{ignition => gz}/plugin/detail/Register.hh (100%) diff --git a/core/include/ignition/plugin/CMakeLists.txt b/core/include/gz/plugin/CMakeLists.txt similarity index 100% rename from core/include/ignition/plugin/CMakeLists.txt rename to core/include/gz/plugin/CMakeLists.txt diff --git a/core/include/ignition/plugin/EnablePluginFromThis.hh b/core/include/gz/plugin/EnablePluginFromThis.hh similarity index 100% rename from core/include/ignition/plugin/EnablePluginFromThis.hh rename to core/include/gz/plugin/EnablePluginFromThis.hh diff --git a/core/include/ignition/plugin/Factory.hh b/core/include/gz/plugin/Factory.hh similarity index 100% rename from core/include/ignition/plugin/Factory.hh rename to core/include/gz/plugin/Factory.hh diff --git a/core/include/ignition/plugin/Info.hh b/core/include/gz/plugin/Info.hh similarity index 100% rename from core/include/ignition/plugin/Info.hh rename to core/include/gz/plugin/Info.hh diff --git a/core/include/ignition/plugin/Plugin.hh b/core/include/gz/plugin/Plugin.hh similarity index 100% rename from core/include/ignition/plugin/Plugin.hh rename to core/include/gz/plugin/Plugin.hh diff --git a/core/include/ignition/plugin/PluginPtr.hh b/core/include/gz/plugin/PluginPtr.hh similarity index 100% rename from core/include/ignition/plugin/PluginPtr.hh rename to core/include/gz/plugin/PluginPtr.hh diff --git a/core/include/ignition/plugin/SpecializedPlugin.hh b/core/include/gz/plugin/SpecializedPlugin.hh similarity index 100% rename from core/include/ignition/plugin/SpecializedPlugin.hh rename to core/include/gz/plugin/SpecializedPlugin.hh diff --git a/core/include/ignition/plugin/SpecializedPluginPtr.hh b/core/include/gz/plugin/SpecializedPluginPtr.hh similarity index 100% rename from core/include/ignition/plugin/SpecializedPluginPtr.hh rename to core/include/gz/plugin/SpecializedPluginPtr.hh diff --git a/core/include/ignition/plugin/WeakPluginPtr.hh b/core/include/gz/plugin/WeakPluginPtr.hh similarity index 100% rename from core/include/ignition/plugin/WeakPluginPtr.hh rename to core/include/gz/plugin/WeakPluginPtr.hh diff --git a/core/include/ignition/plugin/config.hh.in b/core/include/gz/plugin/config.hh.in similarity index 100% rename from core/include/ignition/plugin/config.hh.in rename to core/include/gz/plugin/config.hh.in diff --git a/core/include/ignition/plugin/detail/Factory.hh b/core/include/gz/plugin/detail/Factory.hh similarity index 100% rename from core/include/ignition/plugin/detail/Factory.hh rename to core/include/gz/plugin/detail/Factory.hh diff --git a/core/include/ignition/plugin/detail/Plugin.hh b/core/include/gz/plugin/detail/Plugin.hh similarity index 100% rename from core/include/ignition/plugin/detail/Plugin.hh rename to core/include/gz/plugin/detail/Plugin.hh diff --git a/core/include/ignition/plugin/detail/PluginPtr.hh b/core/include/gz/plugin/detail/PluginPtr.hh similarity index 100% rename from core/include/ignition/plugin/detail/PluginPtr.hh rename to core/include/gz/plugin/detail/PluginPtr.hh diff --git a/core/include/ignition/plugin/detail/SpecializedPlugin.hh b/core/include/gz/plugin/detail/SpecializedPlugin.hh similarity index 100% rename from core/include/ignition/plugin/detail/SpecializedPlugin.hh rename to core/include/gz/plugin/detail/SpecializedPlugin.hh diff --git a/core/include/ignition/plugin/detail/utility.hh b/core/include/gz/plugin/detail/utility.hh similarity index 100% rename from core/include/ignition/plugin/detail/utility.hh rename to core/include/gz/plugin/detail/utility.hh diff --git a/core/include/ignition/plugin/utility.hh b/core/include/gz/plugin/utility.hh similarity index 100% rename from core/include/ignition/plugin/utility.hh rename to core/include/gz/plugin/utility.hh diff --git a/loader/include/ignition/plugin/Loader.hh b/loader/include/gz/plugin/Loader.hh similarity index 100% rename from loader/include/ignition/plugin/Loader.hh rename to loader/include/gz/plugin/Loader.hh diff --git a/loader/include/ignition/plugin/detail/Loader.hh b/loader/include/gz/plugin/detail/Loader.hh similarity index 100% rename from loader/include/ignition/plugin/detail/Loader.hh rename to loader/include/gz/plugin/detail/Loader.hh diff --git a/register/include/ignition/plugin/Register.hh b/register/include/gz/plugin/Register.hh similarity index 100% rename from register/include/ignition/plugin/Register.hh rename to register/include/gz/plugin/Register.hh diff --git a/register/include/ignition/plugin/RegisterMore.hh b/register/include/gz/plugin/RegisterMore.hh similarity index 100% rename from register/include/ignition/plugin/RegisterMore.hh rename to register/include/gz/plugin/RegisterMore.hh diff --git a/register/include/ignition/plugin/detail/Register.hh b/register/include/gz/plugin/detail/Register.hh similarity index 100% rename from register/include/ignition/plugin/detail/Register.hh rename to register/include/gz/plugin/detail/Register.hh From 2b0eefb7ae35d42cb57e91b548badebb6bef8bb6 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 28 Apr 2022 15:06:38 -0700 Subject: [PATCH 2/4] Create redirection aliases Signed-off-by: methylDragon --- core/include/ignition/plugin.hh | 18 ++++++++++++++++++ .../ignition/plugin/EnablePluginFromThis.hh | 18 ++++++++++++++++++ core/include/ignition/plugin/Export.hh | 18 ++++++++++++++++++ core/include/ignition/plugin/Factory.hh | 18 ++++++++++++++++++ core/include/ignition/plugin/Info.hh | 18 ++++++++++++++++++ core/include/ignition/plugin/Plugin.hh | 18 ++++++++++++++++++ core/include/ignition/plugin/PluginPtr.hh | 18 ++++++++++++++++++ .../ignition/plugin/SpecializedPlugin.hh | 18 ++++++++++++++++++ .../ignition/plugin/SpecializedPluginPtr.hh | 18 ++++++++++++++++++ core/include/ignition/plugin/WeakPluginPtr.hh | 18 ++++++++++++++++++ core/include/ignition/plugin/config.hh | 18 ++++++++++++++++++ core/include/ignition/plugin/detail/Export.hh | 18 ++++++++++++++++++ core/include/ignition/plugin/detail/Factory.hh | 18 ++++++++++++++++++ core/include/ignition/plugin/detail/Plugin.hh | 18 ++++++++++++++++++ .../ignition/plugin/detail/PluginPtr.hh | 18 ++++++++++++++++++ .../plugin/detail/SpecializedPlugin.hh | 18 ++++++++++++++++++ core/include/ignition/plugin/detail/utility.hh | 18 ++++++++++++++++++ core/include/ignition/plugin/utility.hh | 18 ++++++++++++++++++ loader/include/ignition/plugin/Loader.hh | 18 ++++++++++++++++++ .../include/ignition/plugin/detail/Loader.hh | 18 ++++++++++++++++++ .../include/ignition/plugin/loader/Export.hh | 18 ++++++++++++++++++ .../ignition/plugin/loader/detail/Export.hh | 18 ++++++++++++++++++ register/include/ignition/plugin/Register.hh | 18 ++++++++++++++++++ .../include/ignition/plugin/RegisterMore.hh | 18 ++++++++++++++++++ .../include/ignition/plugin/detail/Register.hh | 18 ++++++++++++++++++ 25 files changed, 450 insertions(+) create mode 100644 core/include/ignition/plugin.hh create mode 100644 core/include/ignition/plugin/EnablePluginFromThis.hh create mode 100644 core/include/ignition/plugin/Export.hh create mode 100644 core/include/ignition/plugin/Factory.hh create mode 100644 core/include/ignition/plugin/Info.hh create mode 100644 core/include/ignition/plugin/Plugin.hh create mode 100644 core/include/ignition/plugin/PluginPtr.hh create mode 100644 core/include/ignition/plugin/SpecializedPlugin.hh create mode 100644 core/include/ignition/plugin/SpecializedPluginPtr.hh create mode 100644 core/include/ignition/plugin/WeakPluginPtr.hh create mode 100644 core/include/ignition/plugin/config.hh create mode 100644 core/include/ignition/plugin/detail/Export.hh create mode 100644 core/include/ignition/plugin/detail/Factory.hh create mode 100644 core/include/ignition/plugin/detail/Plugin.hh create mode 100644 core/include/ignition/plugin/detail/PluginPtr.hh create mode 100644 core/include/ignition/plugin/detail/SpecializedPlugin.hh create mode 100644 core/include/ignition/plugin/detail/utility.hh create mode 100644 core/include/ignition/plugin/utility.hh create mode 100644 loader/include/ignition/plugin/Loader.hh create mode 100644 loader/include/ignition/plugin/detail/Loader.hh create mode 100644 loader/include/ignition/plugin/loader/Export.hh create mode 100644 loader/include/ignition/plugin/loader/detail/Export.hh create mode 100644 register/include/ignition/plugin/Register.hh create mode 100644 register/include/ignition/plugin/RegisterMore.hh create mode 100644 register/include/ignition/plugin/detail/Register.hh diff --git a/core/include/ignition/plugin.hh b/core/include/ignition/plugin.hh new file mode 100644 index 00000000..98c5f190 --- /dev/null +++ b/core/include/ignition/plugin.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2022 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 diff --git a/core/include/ignition/plugin/EnablePluginFromThis.hh b/core/include/ignition/plugin/EnablePluginFromThis.hh new file mode 100644 index 00000000..7825a45e --- /dev/null +++ b/core/include/ignition/plugin/EnablePluginFromThis.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2018 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 diff --git a/core/include/ignition/plugin/Export.hh b/core/include/ignition/plugin/Export.hh new file mode 100644 index 00000000..50c1d69e --- /dev/null +++ b/core/include/ignition/plugin/Export.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2022 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 diff --git a/core/include/ignition/plugin/Factory.hh b/core/include/ignition/plugin/Factory.hh new file mode 100644 index 00000000..487744b3 --- /dev/null +++ b/core/include/ignition/plugin/Factory.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2018 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 diff --git a/core/include/ignition/plugin/Info.hh b/core/include/ignition/plugin/Info.hh new file mode 100644 index 00000000..c5982cf6 --- /dev/null +++ b/core/include/ignition/plugin/Info.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2017 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 diff --git a/core/include/ignition/plugin/Plugin.hh b/core/include/ignition/plugin/Plugin.hh new file mode 100644 index 00000000..7c3e8d10 --- /dev/null +++ b/core/include/ignition/plugin/Plugin.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2017 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 diff --git a/core/include/ignition/plugin/PluginPtr.hh b/core/include/ignition/plugin/PluginPtr.hh new file mode 100644 index 00000000..336fb985 --- /dev/null +++ b/core/include/ignition/plugin/PluginPtr.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2017 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 diff --git a/core/include/ignition/plugin/SpecializedPlugin.hh b/core/include/ignition/plugin/SpecializedPlugin.hh new file mode 100644 index 00000000..48b27d75 --- /dev/null +++ b/core/include/ignition/plugin/SpecializedPlugin.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2017 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 diff --git a/core/include/ignition/plugin/SpecializedPluginPtr.hh b/core/include/ignition/plugin/SpecializedPluginPtr.hh new file mode 100644 index 00000000..e21ac644 --- /dev/null +++ b/core/include/ignition/plugin/SpecializedPluginPtr.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2017 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 diff --git a/core/include/ignition/plugin/WeakPluginPtr.hh b/core/include/ignition/plugin/WeakPluginPtr.hh new file mode 100644 index 00000000..2947bcac --- /dev/null +++ b/core/include/ignition/plugin/WeakPluginPtr.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2018 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 diff --git a/core/include/ignition/plugin/config.hh b/core/include/ignition/plugin/config.hh new file mode 100644 index 00000000..f4b7faa6 --- /dev/null +++ b/core/include/ignition/plugin/config.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2022 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 diff --git a/core/include/ignition/plugin/detail/Export.hh b/core/include/ignition/plugin/detail/Export.hh new file mode 100644 index 00000000..4f226316 --- /dev/null +++ b/core/include/ignition/plugin/detail/Export.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2022 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 diff --git a/core/include/ignition/plugin/detail/Factory.hh b/core/include/ignition/plugin/detail/Factory.hh new file mode 100644 index 00000000..d972a2fb --- /dev/null +++ b/core/include/ignition/plugin/detail/Factory.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2018 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 diff --git a/core/include/ignition/plugin/detail/Plugin.hh b/core/include/ignition/plugin/detail/Plugin.hh new file mode 100644 index 00000000..8e009d5e --- /dev/null +++ b/core/include/ignition/plugin/detail/Plugin.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2017 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 diff --git a/core/include/ignition/plugin/detail/PluginPtr.hh b/core/include/ignition/plugin/detail/PluginPtr.hh new file mode 100644 index 00000000..f812a59f --- /dev/null +++ b/core/include/ignition/plugin/detail/PluginPtr.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2017 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 diff --git a/core/include/ignition/plugin/detail/SpecializedPlugin.hh b/core/include/ignition/plugin/detail/SpecializedPlugin.hh new file mode 100644 index 00000000..a9275543 --- /dev/null +++ b/core/include/ignition/plugin/detail/SpecializedPlugin.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2017 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 diff --git a/core/include/ignition/plugin/detail/utility.hh b/core/include/ignition/plugin/detail/utility.hh new file mode 100644 index 00000000..38c344de --- /dev/null +++ b/core/include/ignition/plugin/detail/utility.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2017 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 diff --git a/core/include/ignition/plugin/utility.hh b/core/include/ignition/plugin/utility.hh new file mode 100644 index 00000000..a09a8639 --- /dev/null +++ b/core/include/ignition/plugin/utility.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2018 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 diff --git a/loader/include/ignition/plugin/Loader.hh b/loader/include/ignition/plugin/Loader.hh new file mode 100644 index 00000000..eeabec39 --- /dev/null +++ b/loader/include/ignition/plugin/Loader.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2017 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 diff --git a/loader/include/ignition/plugin/detail/Loader.hh b/loader/include/ignition/plugin/detail/Loader.hh new file mode 100644 index 00000000..428e0e71 --- /dev/null +++ b/loader/include/ignition/plugin/detail/Loader.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2017 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 diff --git a/loader/include/ignition/plugin/loader/Export.hh b/loader/include/ignition/plugin/loader/Export.hh new file mode 100644 index 00000000..c4505434 --- /dev/null +++ b/loader/include/ignition/plugin/loader/Export.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2022 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 diff --git a/loader/include/ignition/plugin/loader/detail/Export.hh b/loader/include/ignition/plugin/loader/detail/Export.hh new file mode 100644 index 00000000..351ef981 --- /dev/null +++ b/loader/include/ignition/plugin/loader/detail/Export.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2022 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 diff --git a/register/include/ignition/plugin/Register.hh b/register/include/ignition/plugin/Register.hh new file mode 100644 index 00000000..7a3d2926 --- /dev/null +++ b/register/include/ignition/plugin/Register.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2017 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 diff --git a/register/include/ignition/plugin/RegisterMore.hh b/register/include/ignition/plugin/RegisterMore.hh new file mode 100644 index 00000000..1fe8663e --- /dev/null +++ b/register/include/ignition/plugin/RegisterMore.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2018 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 diff --git a/register/include/ignition/plugin/detail/Register.hh b/register/include/ignition/plugin/detail/Register.hh new file mode 100644 index 00000000..1e1ead2f --- /dev/null +++ b/register/include/ignition/plugin/detail/Register.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2017 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 From 623c6efd37699a91076ad55ec579712a48e6fad0 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 28 Apr 2022 15:06:44 -0700 Subject: [PATCH 3/4] Migrate sources in src, test, examples, and include Signed-off-by: methylDragon --- core/include/gz/plugin/EnablePluginFromThis.hh | 6 +++--- core/include/gz/plugin/Factory.hh | 8 ++++---- core/include/gz/plugin/Info.hh | 8 ++++---- core/include/gz/plugin/Plugin.hh | 12 ++++++------ core/include/gz/plugin/PluginPtr.hh | 8 ++++---- core/include/gz/plugin/SpecializedPlugin.hh | 8 ++++---- core/include/gz/plugin/SpecializedPluginPtr.hh | 8 ++++---- core/include/gz/plugin/WeakPluginPtr.hh | 6 +++--- core/include/gz/plugin/detail/Factory.hh | 8 ++++---- core/include/gz/plugin/detail/Plugin.hh | 6 +++--- core/include/gz/plugin/detail/PluginPtr.hh | 8 ++++---- .../gz/plugin/detail/SpecializedPlugin.hh | 6 +++--- core/include/gz/plugin/detail/utility.hh | 4 ++-- core/include/gz/plugin/utility.hh | 8 ++++---- examples/integrators.cc | 4 ++-- examples/plugins/ExponentialODE.cc | 2 +- examples/plugins/ForwardEuler.cc | 2 +- examples/plugins/PolynomialODE.cc | 2 +- examples/plugins/RungeKutta4.cc | 2 +- examples/plugins/integrators.hh | 4 ++-- examples/plugins/robot.hh | 10 +++++----- examples/robot.cc | 6 +++--- loader/include/gz/plugin/Loader.hh | 12 ++++++------ loader/include/gz/plugin/detail/Loader.hh | 8 ++++---- register/include/gz/plugin/Register.hh | 12 ++++++------ register/include/gz/plugin/RegisterMore.hh | 10 +++++----- register/include/gz/plugin/detail/Register.hh | 16 ++++++++-------- 27 files changed, 97 insertions(+), 97 deletions(-) diff --git a/core/include/gz/plugin/EnablePluginFromThis.hh b/core/include/gz/plugin/EnablePluginFromThis.hh index 01ad28a9..6deaf4d9 100644 --- a/core/include/gz/plugin/EnablePluginFromThis.hh +++ b/core/include/gz/plugin/EnablePluginFromThis.hh @@ -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 -#include +#include namespace ignition { diff --git a/core/include/gz/plugin/Factory.hh b/core/include/gz/plugin/Factory.hh index 3cf47113..0b533c78 100644 --- a/core/include/gz/plugin/Factory.hh +++ b/core/include/gz/plugin/Factory.hh @@ -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 #include #include #include -#include +#include namespace ignition { @@ -143,6 +143,6 @@ namespace ignition } } -#include +#include #endif diff --git a/core/include/gz/plugin/Info.hh b/core/include/gz/plugin/Info.hh index aed1a315..736f99ad 100644 --- a/core/include/gz/plugin/Info.hh +++ b/core/include/gz/plugin/Info.hh @@ -16,8 +16,8 @@ */ -#ifndef IGNITION_PLUGIN_INFO_HH_ -#define IGNITION_PLUGIN_INFO_HH_ +#ifndef GZ_PLUGIN_INFO_HH_ +#define GZ_PLUGIN_INFO_HH_ #include #include @@ -25,9 +25,9 @@ #include #include -#include +#include -#include +#include namespace ignition { diff --git a/core/include/gz/plugin/Plugin.hh b/core/include/gz/plugin/Plugin.hh index 72e2f886..71c3abc8 100644 --- a/core/include/gz/plugin/Plugin.hh +++ b/core/include/gz/plugin/Plugin.hh @@ -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 #include #include -#include +#include -#include -#include +#include +#include namespace ignition { @@ -188,6 +188,6 @@ namespace ignition } } -#include "ignition/plugin/detail/Plugin.hh" +#include "gz/plugin/detail/Plugin.hh" #endif diff --git a/core/include/gz/plugin/PluginPtr.hh b/core/include/gz/plugin/PluginPtr.hh index b67ea7dc..51d547c6 100644 --- a/core/include/gz/plugin/PluginPtr.hh +++ b/core/include/gz/plugin/PluginPtr.hh @@ -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 #include #include -#include +#include namespace ignition { @@ -218,6 +218,6 @@ namespace ignition } } -#include "ignition/plugin/detail/PluginPtr.hh" +#include "gz/plugin/detail/PluginPtr.hh" #endif diff --git a/core/include/gz/plugin/SpecializedPlugin.hh b/core/include/gz/plugin/SpecializedPlugin.hh index 5dcb3063..71fbcced 100644 --- a/core/include/gz/plugin/SpecializedPlugin.hh +++ b/core/include/gz/plugin/SpecializedPlugin.hh @@ -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 -#include "ignition/plugin/Plugin.hh" +#include "gz/plugin/Plugin.hh" namespace ignition { @@ -160,6 +160,6 @@ namespace ignition } } -#include "ignition/plugin/detail/SpecializedPlugin.hh" +#include "gz/plugin/detail/SpecializedPlugin.hh" #endif diff --git a/core/include/gz/plugin/SpecializedPluginPtr.hh b/core/include/gz/plugin/SpecializedPluginPtr.hh index 30cc436a..6e9ba354 100644 --- a/core/include/gz/plugin/SpecializedPluginPtr.hh +++ b/core/include/gz/plugin/SpecializedPluginPtr.hh @@ -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 { diff --git a/core/include/gz/plugin/WeakPluginPtr.hh b/core/include/gz/plugin/WeakPluginPtr.hh index a9e6f8ad..5968d71b 100644 --- a/core/include/gz/plugin/WeakPluginPtr.hh +++ b/core/include/gz/plugin/WeakPluginPtr.hh @@ -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 -#include +#include namespace ignition { diff --git a/core/include/gz/plugin/detail/Factory.hh b/core/include/gz/plugin/detail/Factory.hh index 78ef4044..73e5716a 100644 --- a/core/include/gz/plugin/detail/Factory.hh +++ b/core/include/gz/plugin/detail/Factory.hh @@ -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 #include -#include +#include -#include +#include namespace ignition { diff --git a/core/include/gz/plugin/detail/Plugin.hh b/core/include/gz/plugin/detail/Plugin.hh index d2d47c63..6e1b8070 100644 --- a/core/include/gz/plugin/detail/Plugin.hh +++ b/core/include/gz/plugin/detail/Plugin.hh @@ -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 #include -#include +#include namespace ignition { diff --git a/core/include/gz/plugin/detail/PluginPtr.hh b/core/include/gz/plugin/detail/PluginPtr.hh index 242c92c9..2372928d 100644 --- a/core/include/gz/plugin/detail/PluginPtr.hh +++ b/core/include/gz/plugin/detail/PluginPtr.hh @@ -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 #include -#include -#include +#include +#include namespace ignition { diff --git a/core/include/gz/plugin/detail/SpecializedPlugin.hh b/core/include/gz/plugin/detail/SpecializedPlugin.hh index 41853dae..78427252 100644 --- a/core/include/gz/plugin/detail/SpecializedPlugin.hh +++ b/core/include/gz/plugin/detail/SpecializedPlugin.hh @@ -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 -#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 diff --git a/core/include/gz/plugin/detail/utility.hh b/core/include/gz/plugin/detail/utility.hh index 1f6d32f1..af24e17d 100644 --- a/core/include/gz/plugin/detail/utility.hh +++ b/core/include/gz/plugin/detail/utility.hh @@ -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 diff --git a/core/include/gz/plugin/utility.hh b/core/include/gz/plugin/utility.hh index 12e60220..867f9e1f 100644 --- a/core/include/gz/plugin/utility.hh +++ b/core/include/gz/plugin/utility.hh @@ -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 -#include -#include +#include +#include namespace ignition { diff --git a/examples/integrators.cc b/examples/integrators.cc index 77c1e561..5be94e65 100644 --- a/examples/integrators.cc +++ b/examples/integrators.cc @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include "plugins/integrators.hh" diff --git a/examples/plugins/ExponentialODE.cc b/examples/plugins/ExponentialODE.cc index e853f02f..a6b8e7f0 100644 --- a/examples/plugins/ExponentialODE.cc +++ b/examples/plugins/ExponentialODE.cc @@ -17,7 +17,7 @@ #include -#include +#include #include "integrators.hh" diff --git a/examples/plugins/ForwardEuler.cc b/examples/plugins/ForwardEuler.cc index d62013e5..636d97b6 100644 --- a/examples/plugins/ForwardEuler.cc +++ b/examples/plugins/ForwardEuler.cc @@ -17,7 +17,7 @@ #include -#include +#include #include "integrators.hh" diff --git a/examples/plugins/PolynomialODE.cc b/examples/plugins/PolynomialODE.cc index bce1b05d..d91a45de 100644 --- a/examples/plugins/PolynomialODE.cc +++ b/examples/plugins/PolynomialODE.cc @@ -17,7 +17,7 @@ #include -#include +#include #include "integrators.hh" diff --git a/examples/plugins/RungeKutta4.cc b/examples/plugins/RungeKutta4.cc index 7cd042f4..dbfa9e3f 100644 --- a/examples/plugins/RungeKutta4.cc +++ b/examples/plugins/RungeKutta4.cc @@ -17,7 +17,7 @@ #include -#include +#include #include "integrators.hh" diff --git a/examples/plugins/integrators.hh b/examples/plugins/integrators.hh index 7a1238d5..b83c2a59 100644 --- a/examples/plugins/integrators.hh +++ b/examples/plugins/integrators.hh @@ -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 #include diff --git a/examples/plugins/robot.hh b/examples/plugins/robot.hh index 585711ca..f50ce215 100644 --- a/examples/plugins/robot.hh +++ b/examples/plugins/robot.hh @@ -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 -#include -#include +#include +#include -#include +#include namespace ignition { diff --git a/examples/robot.cc b/examples/robot.cc index b258231c..7cd30dba 100644 --- a/examples/robot.cc +++ b/examples/robot.cc @@ -22,9 +22,9 @@ #include "plugins/robot.hh" -#include -#include -#include +#include +#include +#include #ifdef HAVE_BOOST_PROGRAM_OPTIONS #include diff --git a/loader/include/gz/plugin/Loader.hh b/loader/include/gz/plugin/Loader.hh index e5433eee..e10fc8e0 100644 --- a/loader/include/gz/plugin/Loader.hh +++ b/loader/include/gz/plugin/Loader.hh @@ -16,8 +16,8 @@ */ -#ifndef IGNITION_PLUGIN_LOADER_HH_ -#define IGNITION_PLUGIN_LOADER_HH_ +#ifndef GZ_PLUGIN_LOADER_HH_ +#define GZ_PLUGIN_LOADER_HH_ #include #include @@ -25,10 +25,10 @@ #include #include -#include +#include -#include -#include +#include +#include namespace ignition { @@ -251,6 +251,6 @@ namespace ignition } } -#include +#include #endif diff --git a/loader/include/gz/plugin/detail/Loader.hh b/loader/include/gz/plugin/detail/Loader.hh index 49a293ae..ce5ce0f6 100644 --- a/loader/include/gz/plugin/detail/Loader.hh +++ b/loader/include/gz/plugin/detail/Loader.hh @@ -16,14 +16,14 @@ */ -#ifndef IGNITION_PLUGIN_DETAIL_LOADER_HH_ -#define IGNITION_PLUGIN_DETAIL_LOADER_HH_ +#ifndef GZ_PLUGIN_DETAIL_LOADER_HH_ +#define GZ_PLUGIN_DETAIL_LOADER_HH_ #include #include #include -#include -#include +#include +#include namespace ignition { diff --git a/register/include/gz/plugin/Register.hh b/register/include/gz/plugin/Register.hh index e0cb43ad..ca7d8bff 100644 --- a/register/include/gz/plugin/Register.hh +++ b/register/include/gz/plugin/Register.hh @@ -16,10 +16,10 @@ */ -#ifndef IGNITION_PLUGIN_REGISTER_HH_ -#define IGNITION_PLUGIN_REGISTER_HH_ +#ifndef GZ_PLUGIN_REGISTER_HH_ +#define GZ_PLUGIN_REGISTER_HH_ -#include +#include // ------------- Add a set of plugins or a set of interfaces ------------------ @@ -47,8 +47,8 @@ /// /// If your library has multiple translation units (.cpp files) and you want to /// register plugins in multiple translation units, use this -/// ignition/plugin/Register.hh header in ONE of the translation units, and then -/// the ignition/plugin/RegisterMore.hh header in all of the rest of the +/// gz/plugin/Register.hh header in ONE of the translation units, and then +/// the gz/plugin/RegisterMore.hh header in all of the rest of the /// translation units. #define IGNITION_ADD_PLUGIN(PluginClass, ...) \ DETAIL_IGNITION_ADD_PLUGIN(PluginClass, __VA_ARGS__) @@ -85,7 +85,7 @@ /// memory management system the consumer prefers. /// /// The inputs and output of a factory are defined using the -/// ignition::plugin::Factory class in the ignition/plugin/Factory.hh header. +/// ignition::plugin::Factory class in the gz/plugin/Factory.hh header. /// /// The first argument of this macro should be the class that implements the /// factory's output interface. The second argument should be the factory diff --git a/register/include/gz/plugin/RegisterMore.hh b/register/include/gz/plugin/RegisterMore.hh index a69d6d8b..4763420f 100644 --- a/register/include/gz/plugin/RegisterMore.hh +++ b/register/include/gz/plugin/RegisterMore.hh @@ -16,21 +16,21 @@ */ -#ifndef IGNITION_PLUGIN_REGISTERMORE_HH_ -#define IGNITION_PLUGIN_REGISTERMORE_HH_ +#ifndef GZ_PLUGIN_REGISTERMORE_HH_ +#define GZ_PLUGIN_REGISTERMORE_HH_ /// If your library already has a translation unit (.cpp file) containing /// \code -/// #include +/// #include /// \endcode /// /// then any other translation units that want to register plugins should use /// \code -/// #include +/// #include /// \endcode /// /// But at least one translation unit of your library must contain Register.hh. #define IGN_PLUGIN_REGISTER_MORE_TRANS_UNITS -#include +#include #endif diff --git a/register/include/gz/plugin/detail/Register.hh b/register/include/gz/plugin/detail/Register.hh index 021d93b3..bfffebba 100644 --- a/register/include/gz/plugin/detail/Register.hh +++ b/register/include/gz/plugin/detail/Register.hh @@ -16,8 +16,8 @@ */ -#ifndef IGNITION_PLUGIN_DETAIL_REGISTER_HH_ -#define IGNITION_PLUGIN_DETAIL_REGISTER_HH_ +#ifndef GZ_PLUGIN_DETAIL_REGISTER_HH_ +#define GZ_PLUGIN_DETAIL_REGISTER_HH_ #include #include @@ -25,11 +25,11 @@ #include #include -#include +#include -#include -#include -#include +#include +#include +#include #if defined _WIN32 || defined __CYGWIN__ @@ -113,8 +113,8 @@ extern "C" // multiple definitions of IgnitionPluginHook, // then make sure that all but one of your // library's translation units (.cpp files) includes the - // header instead of - // . + // header instead of + // . // // Only ONE and exactly ONE .cpp file in your library should include // Register.hh. All the rest should include RegisterMore.hh. It does not From 3db49e5616a9328a6b58231cdd65ee90ea0cf9e8 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 28 Apr 2022 15:10:48 -0700 Subject: [PATCH 4/4] Migrate CMake files Signed-off-by: methylDragon --- CMakeLists.txt | 4 +++- core/CMakeLists.txt | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 05a1b39c..14e65800 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,9 @@ set(IGN_CMAKE_VER ${ignition-cmake3_VERSION_MAJOR}) #============================================================================ # Configure the project #============================================================================ -ign_configure_project(VERSION_SUFFIX pre0) +ign_configure_project( + REPLACE_IGNITION_INCLUDE_PATH gz/plugin + VERSION_SUFFIX pre0) #============================================================================ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index fd239c4d..75cfc2a8 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -17,4 +17,5 @@ ign_build_tests( SOURCES ${tests}) -add_subdirectory(include/ignition/plugin) +add_subdirectory(include/gz/plugin) +install(DIRECTORY include/ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})