From 450f7be2e21d6446b4e702319724670371ee44f5 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Thu, 27 Jul 2023 05:59:01 -0700 Subject: [PATCH] Remove ignition Signed-off-by: Nate Koenig --- core/CMakeLists.txt | 1 - core/include/ignition/plugin.hh | 19 -------- .../ignition/plugin/EnablePluginFromThis.hh | 19 -------- core/include/ignition/plugin/Export.hh | 19 -------- core/include/ignition/plugin/Factory.hh | 19 -------- core/include/ignition/plugin/Info.hh | 19 -------- core/include/ignition/plugin/Plugin.hh | 19 -------- core/include/ignition/plugin/PluginPtr.hh | 19 -------- .../ignition/plugin/SpecializedPlugin.hh | 19 -------- .../ignition/plugin/SpecializedPluginPtr.hh | 19 -------- core/include/ignition/plugin/WeakPluginPtr.hh | 19 -------- core/include/ignition/plugin/config.hh | 44 ------------------- core/include/ignition/plugin/detail/Export.hh | 19 -------- .../include/ignition/plugin/detail/Factory.hh | 19 -------- core/include/ignition/plugin/detail/Plugin.hh | 19 -------- .../ignition/plugin/detail/PluginPtr.hh | 19 -------- .../plugin/detail/SpecializedPlugin.hh | 19 -------- .../include/ignition/plugin/detail/utility.hh | 19 -------- core/include/ignition/plugin/utility.hh | 19 -------- loader/include/ignition/plugin/Loader.hh | 19 -------- .../include/ignition/plugin/detail/Loader.hh | 19 -------- .../include/ignition/plugin/loader/Export.hh | 19 -------- .../ignition/plugin/loader/detail/Export.hh | 19 -------- loader/src/cmd/gz.cc | 5 --- loader/src/cmd/gz.hh | 1 - register/include/ignition/plugin/Register.hh | 31 ------------- .../include/ignition/plugin/RegisterMore.hh | 22 ---------- .../include/ignition/plugin/RegisterStatic.hh | 25 ----------- .../ignition/plugin/detail/Register.hh | 19 -------- .../ignition/plugin/detail/RegisterStatic.hh | 19 -------- test/integration/deprecated_TEST.cc | 32 -------------- 31 files changed, 598 deletions(-) delete mode 100644 core/include/ignition/plugin.hh delete mode 100644 core/include/ignition/plugin/EnablePluginFromThis.hh delete mode 100644 core/include/ignition/plugin/Export.hh delete mode 100644 core/include/ignition/plugin/Factory.hh delete mode 100644 core/include/ignition/plugin/Info.hh delete mode 100644 core/include/ignition/plugin/Plugin.hh delete mode 100644 core/include/ignition/plugin/PluginPtr.hh delete mode 100644 core/include/ignition/plugin/SpecializedPlugin.hh delete mode 100644 core/include/ignition/plugin/SpecializedPluginPtr.hh delete mode 100644 core/include/ignition/plugin/WeakPluginPtr.hh delete mode 100644 core/include/ignition/plugin/config.hh delete mode 100644 core/include/ignition/plugin/detail/Export.hh delete mode 100644 core/include/ignition/plugin/detail/Factory.hh delete mode 100644 core/include/ignition/plugin/detail/Plugin.hh delete mode 100644 core/include/ignition/plugin/detail/PluginPtr.hh delete mode 100644 core/include/ignition/plugin/detail/SpecializedPlugin.hh delete mode 100644 core/include/ignition/plugin/detail/utility.hh delete mode 100644 core/include/ignition/plugin/utility.hh delete mode 100644 loader/include/ignition/plugin/Loader.hh delete mode 100644 loader/include/ignition/plugin/detail/Loader.hh delete mode 100644 loader/include/ignition/plugin/loader/Export.hh delete mode 100644 loader/include/ignition/plugin/loader/detail/Export.hh delete mode 100644 register/include/ignition/plugin/Register.hh delete mode 100644 register/include/ignition/plugin/RegisterMore.hh delete mode 100644 register/include/ignition/plugin/RegisterStatic.hh delete mode 100644 register/include/ignition/plugin/detail/Register.hh delete mode 100644 register/include/ignition/plugin/detail/RegisterStatic.hh delete mode 100644 test/integration/deprecated_TEST.cc diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 0d8f4441..7f15c525 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -16,4 +16,3 @@ gz_build_tests( SOURCES ${tests}) add_subdirectory(include/gz/plugin) -install(DIRECTORY include/ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/core/include/ignition/plugin.hh b/core/include/ignition/plugin.hh deleted file mode 100644 index f495c7e2..00000000 --- a/core/include/ignition/plugin.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/EnablePluginFromThis.hh b/core/include/ignition/plugin/EnablePluginFromThis.hh deleted file mode 100644 index 68d8775f..00000000 --- a/core/include/ignition/plugin/EnablePluginFromThis.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/Export.hh b/core/include/ignition/plugin/Export.hh deleted file mode 100644 index 38bf8c26..00000000 --- a/core/include/ignition/plugin/Export.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/Factory.hh b/core/include/ignition/plugin/Factory.hh deleted file mode 100644 index 8b691f9d..00000000 --- a/core/include/ignition/plugin/Factory.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/Info.hh b/core/include/ignition/plugin/Info.hh deleted file mode 100644 index 6ffd5468..00000000 --- a/core/include/ignition/plugin/Info.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/Plugin.hh b/core/include/ignition/plugin/Plugin.hh deleted file mode 100644 index 6047f9ce..00000000 --- a/core/include/ignition/plugin/Plugin.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/PluginPtr.hh b/core/include/ignition/plugin/PluginPtr.hh deleted file mode 100644 index ba0bd46d..00000000 --- a/core/include/ignition/plugin/PluginPtr.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/SpecializedPlugin.hh b/core/include/ignition/plugin/SpecializedPlugin.hh deleted file mode 100644 index 134cff1d..00000000 --- a/core/include/ignition/plugin/SpecializedPlugin.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/SpecializedPluginPtr.hh b/core/include/ignition/plugin/SpecializedPluginPtr.hh deleted file mode 100644 index 5d89d3b4..00000000 --- a/core/include/ignition/plugin/SpecializedPluginPtr.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/WeakPluginPtr.hh b/core/include/ignition/plugin/WeakPluginPtr.hh deleted file mode 100644 index 3e256ad3..00000000 --- a/core/include/ignition/plugin/WeakPluginPtr.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/config.hh b/core/include/ignition/plugin/config.hh deleted file mode 100644 index 20de4a0a..00000000 --- a/core/include/ignition/plugin/config.hh +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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. - * - */ - -#ifndef IGNITION_PLUGIN__CONFIG_HH_ -#define IGNITION_PLUGIN__CONFIG_HH_ - -#include - -#define IGNITION_PLUGIN_MAJOR_VERSION GZ_PLUGIN_MAJOR_VERSION -#define IGNITION_PLUGIN_MINOR_VERSION GZ_PLUGIN_MINOR_VERSION -#define IGNITION_PLUGIN_PATCH_VERSION GZ_PLUGIN_PATCH_VERSION - -#define IGNITION_PLUGIN_VERSION GZ_PLUGIN_VERSION -#define IGNITION_PLUGIN_VERSION_FULL GZ_PLUGIN_VERSION_FULL - -#define IGNITION_PLUGIN_VERSION_HEADER GZ_PLUGIN_VERSION_HEADER - -namespace gz -{ -} - -namespace ignition -{ - #ifndef SUPPRESS_IGNITION_HEADER_DEPRECATION - #pragma message("ignition namespace is deprecated! Use gz instead!") - #endif - using namespace gz; -} - -#endif diff --git a/core/include/ignition/plugin/detail/Export.hh b/core/include/ignition/plugin/detail/Export.hh deleted file mode 100644 index 55da5ec0..00000000 --- a/core/include/ignition/plugin/detail/Export.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/detail/Factory.hh b/core/include/ignition/plugin/detail/Factory.hh deleted file mode 100644 index c0fa9f34..00000000 --- a/core/include/ignition/plugin/detail/Factory.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/detail/Plugin.hh b/core/include/ignition/plugin/detail/Plugin.hh deleted file mode 100644 index ace7b8ae..00000000 --- a/core/include/ignition/plugin/detail/Plugin.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/detail/PluginPtr.hh b/core/include/ignition/plugin/detail/PluginPtr.hh deleted file mode 100644 index aa8809b9..00000000 --- a/core/include/ignition/plugin/detail/PluginPtr.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/detail/SpecializedPlugin.hh b/core/include/ignition/plugin/detail/SpecializedPlugin.hh deleted file mode 100644 index 3a473a27..00000000 --- a/core/include/ignition/plugin/detail/SpecializedPlugin.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/detail/utility.hh b/core/include/ignition/plugin/detail/utility.hh deleted file mode 100644 index 0d300268..00000000 --- a/core/include/ignition/plugin/detail/utility.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/core/include/ignition/plugin/utility.hh b/core/include/ignition/plugin/utility.hh deleted file mode 100644 index d49fd73c..00000000 --- a/core/include/ignition/plugin/utility.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/loader/include/ignition/plugin/Loader.hh b/loader/include/ignition/plugin/Loader.hh deleted file mode 100644 index 395456ba..00000000 --- a/loader/include/ignition/plugin/Loader.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/loader/include/ignition/plugin/detail/Loader.hh b/loader/include/ignition/plugin/detail/Loader.hh deleted file mode 100644 index 54382131..00000000 --- a/loader/include/ignition/plugin/detail/Loader.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/loader/include/ignition/plugin/loader/Export.hh b/loader/include/ignition/plugin/loader/Export.hh deleted file mode 100644 index 8ef34569..00000000 --- a/loader/include/ignition/plugin/loader/Export.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/loader/include/ignition/plugin/loader/detail/Export.hh b/loader/include/ignition/plugin/loader/detail/Export.hh deleted file mode 100644 index 7facd597..00000000 --- a/loader/include/ignition/plugin/loader/detail/Export.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/loader/src/cmd/gz.cc b/loader/src/cmd/gz.cc index 86925881..90ce1928 100644 --- a/loader/src/cmd/gz.cc +++ b/loader/src/cmd/gz.cc @@ -79,8 +79,3 @@ extern "C" const char *gzVersion() { return strdup(GZ_PLUGIN_VERSION_FULL); } - -extern "C" const char *ignitionVersion() -{ - return gzVersion(); -} diff --git a/loader/src/cmd/gz.hh b/loader/src/cmd/gz.hh index 12741fc8..d5a0dc78 100644 --- a/loader/src/cmd/gz.hh +++ b/loader/src/cmd/gz.hh @@ -23,7 +23,6 @@ /// \brief External hook to read the library version. /// \return C-string representing the version. Ex.: 0.1.2 extern "C" const char *gzVersion(); -extern "C" const char GZ_DEPRECATED(2) *ignitionVersion(); /// \brief Plugin info /// \param[in] _plugin Name of the plugin diff --git a/register/include/ignition/plugin/Register.hh b/register/include/ignition/plugin/Register.hh deleted file mode 100644 index 83722f23..00000000 --- a/register/include/ignition/plugin/Register.hh +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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 -#include - -#define IGNITION_ADD_PLUGIN(PluginClass, ...) \ - GZ_ADD_PLUGIN(PluginClass, __VA_ARGS__) - -#define IGNITION_ADD_PLUGIN_ALIAS(PluginClass, ...) \ - GZ_ADD_PLUGIN_ALIAS(PluginClass, __VA_ARGS__) - -#define IGNITION_ADD_FACTORY(ProductType, FactoryType) \ - GZ_ADD_FACTORY(ProductType, FactoryType) - -#define IGNITION_ADD_FACTORY_ALIAS(ProductType, FactoryType, ...) \ - GZ_ADD_FACTORY_ALIAS(ProductType, FactoryType, __VA_ARGS__) diff --git a/register/include/ignition/plugin/RegisterMore.hh b/register/include/ignition/plugin/RegisterMore.hh deleted file mode 100644 index d0abea89..00000000 --- a/register/include/ignition/plugin/RegisterMore.hh +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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 -#include - -#define IGN_PLUGIN_REGISTER_MORE_TRANS_UNITS \ - GZ_PLUGIN_REGISTER_MORE_TRANS_UNITS diff --git a/register/include/ignition/plugin/RegisterStatic.hh b/register/include/ignition/plugin/RegisterStatic.hh deleted file mode 100644 index 6d56e015..00000000 --- a/register/include/ignition/plugin/RegisterStatic.hh +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 -#include - -#define IGNITION_ADD_STATIC_PLUGIN(PluginClass, ...) \ - GZ_ADD_STATIC_PLUGIN(PluginClass, __VA_ARGS__) - -#define IGNITION_ADD_STATIC_PLUGIN_ALIAS(PluginClass, ...) \ - GZ_ADD_STATIC_PLUGIN_ALIAS(PluginClass, __VA_ARGS__) diff --git a/register/include/ignition/plugin/detail/Register.hh b/register/include/ignition/plugin/detail/Register.hh deleted file mode 100644 index c694be01..00000000 --- a/register/include/ignition/plugin/detail/Register.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/register/include/ignition/plugin/detail/RegisterStatic.hh b/register/include/ignition/plugin/detail/RegisterStatic.hh deleted file mode 100644 index 1186d388..00000000 --- a/register/include/ignition/plugin/detail/RegisterStatic.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc deleted file mode 100644 index e28ea6b7..00000000 --- a/test/integration/deprecated_TEST.cc +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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 - -#define SUPPRESS_IGNITION_HEADER_DEPRECATION - -#include -#include - -///////////////////////////////////////////////// -// Make sure the ignition namespace still works -TEST(Deprecated, IgnitionNamespace) -{ - ignition::plugin::Loader loader; -} - -#undef SUPPRESS_IGNITION_HEADER_DEPRECATION