From 32e401936d30cb9562cc9edf2ebb2f53850fdb5f Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Thu, 12 Oct 2023 15:50:06 -0700 Subject: [PATCH] Remove ignition (#100) Signed-off-by: Nate Koenig Co-authored-by: Nate Koenig Co-authored-by: Addisu Z. Taddese --- cli/include/CMakeLists.txt | 1 - cli/include/external-cli/CMakeLists.txt | 1 - .../external-cli/ignition/utils/cli/App.hpp | 19 ------- .../external-cli/ignition/utils/cli/CLI.hpp | 19 ------- .../ignition/utils/cli/Config.hpp | 19 ------- .../ignition/utils/cli/ConfigFwd.hpp | 19 ------- .../external-cli/ignition/utils/cli/Error.hpp | 19 ------- .../ignition/utils/cli/Formatter.hpp | 19 ------- .../ignition/utils/cli/FormatterFwd.hpp | 19 ------- .../ignition/utils/cli/Macros.hpp | 19 ------- .../ignition/utils/cli/Option.hpp | 19 ------- .../external-cli/ignition/utils/cli/Split.hpp | 19 ------- .../ignition/utils/cli/StringTools.hpp | 19 ------- .../external-cli/ignition/utils/cli/Timer.hpp | 19 ------- .../ignition/utils/cli/TypeTools.hpp | 19 ------- .../ignition/utils/cli/Validators.hpp | 19 ------- .../ignition/utils/cli/Version.hpp | 19 ------- cli/include/gz/utils/cli/GzFormatter.hpp | 7 --- cli/include/ignition/utils/cli.hh | 19 ------- .../ignition/utils/cli/IgnitionFormatter.hpp | 19 ------- cli/include/vendored-cli/CMakeLists.txt | 1 - .../vendored-cli/ignition/utils/cli/App.hpp | 19 ------- .../vendored-cli/ignition/utils/cli/CLI.hpp | 19 ------- .../ignition/utils/cli/Config.hpp | 19 ------- .../ignition/utils/cli/ConfigFwd.hpp | 19 ------- .../vendored-cli/ignition/utils/cli/Error.hpp | 19 ------- .../ignition/utils/cli/Formatter.hpp | 19 ------- .../ignition/utils/cli/FormatterFwd.hpp | 19 ------- .../ignition/utils/cli/Macros.hpp | 19 ------- .../ignition/utils/cli/Option.hpp | 19 ------- .../vendored-cli/ignition/utils/cli/Split.hpp | 19 ------- .../ignition/utils/cli/StringTools.hpp | 19 ------- .../vendored-cli/ignition/utils/cli/Timer.hpp | 19 ------- .../ignition/utils/cli/TypeTools.hpp | 19 ------- .../ignition/utils/cli/Validators.hpp | 19 ------- .../ignition/utils/cli/Version.hpp | 19 ------- include/CMakeLists.txt | 1 - include/ignition/utils.hh | 19 ------- include/ignition/utils/Environment.hh | 19 ------- include/ignition/utils/Export.hh | 19 ------- include/ignition/utils/ExtraTestMacros.hh | 28 ----------- include/ignition/utils/ImplPtr.hh | 31 ------------ include/ignition/utils/NeverDestroyed.hh | 19 ------- include/ignition/utils/SuppressWarning.hh | 49 ------------------- include/ignition/utils/config.hh | 46 ----------------- include/ignition/utils/detail/DefaultOps.hh | 19 ------- include/ignition/utils/detail/Export.hh | 19 ------- .../ignition/utils/detail/ExtraTestMacros.hh | 19 ------- include/ignition/utils/detail/ImplPtr.hh | 19 ------- .../ignition/utils/detail/SuppressWarning.hh | 19 ------- test/integration/deprecated_TEST.cc | 34 ------------- 51 files changed, 978 deletions(-) delete mode 100644 cli/include/external-cli/ignition/utils/cli/App.hpp delete mode 100644 cli/include/external-cli/ignition/utils/cli/CLI.hpp delete mode 100644 cli/include/external-cli/ignition/utils/cli/Config.hpp delete mode 100644 cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp delete mode 100644 cli/include/external-cli/ignition/utils/cli/Error.hpp delete mode 100644 cli/include/external-cli/ignition/utils/cli/Formatter.hpp delete mode 100644 cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp delete mode 100644 cli/include/external-cli/ignition/utils/cli/Macros.hpp delete mode 100644 cli/include/external-cli/ignition/utils/cli/Option.hpp delete mode 100644 cli/include/external-cli/ignition/utils/cli/Split.hpp delete mode 100644 cli/include/external-cli/ignition/utils/cli/StringTools.hpp delete mode 100644 cli/include/external-cli/ignition/utils/cli/Timer.hpp delete mode 100644 cli/include/external-cli/ignition/utils/cli/TypeTools.hpp delete mode 100644 cli/include/external-cli/ignition/utils/cli/Validators.hpp delete mode 100644 cli/include/external-cli/ignition/utils/cli/Version.hpp delete mode 100644 cli/include/ignition/utils/cli.hh delete mode 100644 cli/include/ignition/utils/cli/IgnitionFormatter.hpp delete mode 100644 cli/include/vendored-cli/ignition/utils/cli/App.hpp delete mode 100644 cli/include/vendored-cli/ignition/utils/cli/CLI.hpp delete mode 100644 cli/include/vendored-cli/ignition/utils/cli/Config.hpp delete mode 100644 cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp delete mode 100644 cli/include/vendored-cli/ignition/utils/cli/Error.hpp delete mode 100644 cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp delete mode 100644 cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp delete mode 100644 cli/include/vendored-cli/ignition/utils/cli/Macros.hpp delete mode 100644 cli/include/vendored-cli/ignition/utils/cli/Option.hpp delete mode 100644 cli/include/vendored-cli/ignition/utils/cli/Split.hpp delete mode 100644 cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp delete mode 100644 cli/include/vendored-cli/ignition/utils/cli/Timer.hpp delete mode 100644 cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp delete mode 100644 cli/include/vendored-cli/ignition/utils/cli/Validators.hpp delete mode 100644 cli/include/vendored-cli/ignition/utils/cli/Version.hpp delete mode 100644 include/ignition/utils.hh delete mode 100644 include/ignition/utils/Environment.hh delete mode 100644 include/ignition/utils/Export.hh delete mode 100644 include/ignition/utils/ExtraTestMacros.hh delete mode 100644 include/ignition/utils/ImplPtr.hh delete mode 100644 include/ignition/utils/NeverDestroyed.hh delete mode 100644 include/ignition/utils/SuppressWarning.hh delete mode 100644 include/ignition/utils/config.hh delete mode 100644 include/ignition/utils/detail/DefaultOps.hh delete mode 100644 include/ignition/utils/detail/Export.hh delete mode 100644 include/ignition/utils/detail/ExtraTestMacros.hh delete mode 100644 include/ignition/utils/detail/ImplPtr.hh delete mode 100644 include/ignition/utils/detail/SuppressWarning.hh delete mode 100644 test/integration/deprecated_TEST.cc diff --git a/cli/include/CMakeLists.txt b/cli/include/CMakeLists.txt index 4e887b5..1c9267f 100644 --- a/cli/include/CMakeLists.txt +++ b/cli/include/CMakeLists.txt @@ -16,4 +16,3 @@ else() endif() add_subdirectory(gz/utils) -install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/cli/include/external-cli/CMakeLists.txt b/cli/include/external-cli/CMakeLists.txt index a593b0d..6645618 100644 --- a/cli/include/external-cli/CMakeLists.txt +++ b/cli/include/external-cli/CMakeLists.txt @@ -1,2 +1 @@ add_subdirectory(gz/utils) -install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/cli/include/external-cli/ignition/utils/cli/App.hpp b/cli/include/external-cli/ignition/utils/cli/App.hpp deleted file mode 100644 index 241e127..0000000 --- a/cli/include/external-cli/ignition/utils/cli/App.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 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/cli/include/external-cli/ignition/utils/cli/CLI.hpp b/cli/include/external-cli/ignition/utils/cli/CLI.hpp deleted file mode 100644 index a6c61ce..0000000 --- a/cli/include/external-cli/ignition/utils/cli/CLI.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 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/cli/include/external-cli/ignition/utils/cli/Config.hpp b/cli/include/external-cli/ignition/utils/cli/Config.hpp deleted file mode 100644 index 08af9ed..0000000 --- a/cli/include/external-cli/ignition/utils/cli/Config.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 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/cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp b/cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp deleted file mode 100644 index cfa4b9e..0000000 --- a/cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 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/cli/include/external-cli/ignition/utils/cli/Error.hpp b/cli/include/external-cli/ignition/utils/cli/Error.hpp deleted file mode 100644 index 2e92e7a..0000000 --- a/cli/include/external-cli/ignition/utils/cli/Error.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 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/cli/include/external-cli/ignition/utils/cli/Formatter.hpp b/cli/include/external-cli/ignition/utils/cli/Formatter.hpp deleted file mode 100644 index 602a41b..0000000 --- a/cli/include/external-cli/ignition/utils/cli/Formatter.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 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/cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp b/cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp deleted file mode 100644 index 9a53355..0000000 --- a/cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 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/cli/include/external-cli/ignition/utils/cli/Macros.hpp b/cli/include/external-cli/ignition/utils/cli/Macros.hpp deleted file mode 100644 index 7df60ec..0000000 --- a/cli/include/external-cli/ignition/utils/cli/Macros.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 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/cli/include/external-cli/ignition/utils/cli/Option.hpp b/cli/include/external-cli/ignition/utils/cli/Option.hpp deleted file mode 100644 index fa3a95a..0000000 --- a/cli/include/external-cli/ignition/utils/cli/Option.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 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/cli/include/external-cli/ignition/utils/cli/Split.hpp b/cli/include/external-cli/ignition/utils/cli/Split.hpp deleted file mode 100644 index 68de086..0000000 --- a/cli/include/external-cli/ignition/utils/cli/Split.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 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/cli/include/external-cli/ignition/utils/cli/StringTools.hpp b/cli/include/external-cli/ignition/utils/cli/StringTools.hpp deleted file mode 100644 index 8bdaa63..0000000 --- a/cli/include/external-cli/ignition/utils/cli/StringTools.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 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/cli/include/external-cli/ignition/utils/cli/Timer.hpp b/cli/include/external-cli/ignition/utils/cli/Timer.hpp deleted file mode 100644 index 4753fc3..0000000 --- a/cli/include/external-cli/ignition/utils/cli/Timer.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 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/cli/include/external-cli/ignition/utils/cli/TypeTools.hpp b/cli/include/external-cli/ignition/utils/cli/TypeTools.hpp deleted file mode 100644 index bd0e783..0000000 --- a/cli/include/external-cli/ignition/utils/cli/TypeTools.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 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/cli/include/external-cli/ignition/utils/cli/Validators.hpp b/cli/include/external-cli/ignition/utils/cli/Validators.hpp deleted file mode 100644 index e4336c2..0000000 --- a/cli/include/external-cli/ignition/utils/cli/Validators.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 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/cli/include/external-cli/ignition/utils/cli/Version.hpp b/cli/include/external-cli/ignition/utils/cli/Version.hpp deleted file mode 100644 index c018f60..0000000 --- a/cli/include/external-cli/ignition/utils/cli/Version.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 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/cli/include/gz/utils/cli/GzFormatter.hpp b/cli/include/gz/utils/cli/GzFormatter.hpp index da12cc3..55d8b71 100644 --- a/cli/include/gz/utils/cli/GzFormatter.hpp +++ b/cli/include/gz/utils/cli/GzFormatter.hpp @@ -168,11 +168,4 @@ private: std::unordered_multimap needs; private: std::unordered_multimap needed_by; }; -// TODO(CH3): Deprecated. Remove on tock. -#ifdef _WIN32 - using IgnitionFormatter = GzFormatter; -#else - using IgnitionFormatter GZ_DEPRECATED(2) = GzFormatter; -#endif - #endif // GZ_UTILS_CLI_GZ_FORMATTER_HPP_ diff --git a/cli/include/ignition/utils/cli.hh b/cli/include/ignition/utils/cli.hh deleted file mode 100644 index ab4ffbe..0000000 --- a/cli/include/ignition/utils/cli.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/cli/include/ignition/utils/cli/IgnitionFormatter.hpp b/cli/include/ignition/utils/cli/IgnitionFormatter.hpp deleted file mode 100644 index f86d2e8..0000000 --- a/cli/include/ignition/utils/cli/IgnitionFormatter.hpp +++ /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/cli/include/vendored-cli/CMakeLists.txt b/cli/include/vendored-cli/CMakeLists.txt index a593b0d..6645618 100644 --- a/cli/include/vendored-cli/CMakeLists.txt +++ b/cli/include/vendored-cli/CMakeLists.txt @@ -1,2 +1 @@ add_subdirectory(gz/utils) -install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/cli/include/vendored-cli/ignition/utils/cli/App.hpp b/cli/include/vendored-cli/ignition/utils/cli/App.hpp deleted file mode 100644 index 505fec9..0000000 --- a/cli/include/vendored-cli/ignition/utils/cli/App.hpp +++ /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/cli/include/vendored-cli/ignition/utils/cli/CLI.hpp b/cli/include/vendored-cli/ignition/utils/cli/CLI.hpp deleted file mode 100644 index dc49d80..0000000 --- a/cli/include/vendored-cli/ignition/utils/cli/CLI.hpp +++ /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/cli/include/vendored-cli/ignition/utils/cli/Config.hpp b/cli/include/vendored-cli/ignition/utils/cli/Config.hpp deleted file mode 100644 index c6f8da4..0000000 --- a/cli/include/vendored-cli/ignition/utils/cli/Config.hpp +++ /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/cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp b/cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp deleted file mode 100644 index 2827c90..0000000 --- a/cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp +++ /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/cli/include/vendored-cli/ignition/utils/cli/Error.hpp b/cli/include/vendored-cli/ignition/utils/cli/Error.hpp deleted file mode 100644 index 83a6b36..0000000 --- a/cli/include/vendored-cli/ignition/utils/cli/Error.hpp +++ /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/cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp b/cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp deleted file mode 100644 index 0286346..0000000 --- a/cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp +++ /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/cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp b/cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp deleted file mode 100644 index f8fe406..0000000 --- a/cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp +++ /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/cli/include/vendored-cli/ignition/utils/cli/Macros.hpp b/cli/include/vendored-cli/ignition/utils/cli/Macros.hpp deleted file mode 100644 index d19f485..0000000 --- a/cli/include/vendored-cli/ignition/utils/cli/Macros.hpp +++ /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/cli/include/vendored-cli/ignition/utils/cli/Option.hpp b/cli/include/vendored-cli/ignition/utils/cli/Option.hpp deleted file mode 100644 index 9e99c1d..0000000 --- a/cli/include/vendored-cli/ignition/utils/cli/Option.hpp +++ /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/cli/include/vendored-cli/ignition/utils/cli/Split.hpp b/cli/include/vendored-cli/ignition/utils/cli/Split.hpp deleted file mode 100644 index b38693c..0000000 --- a/cli/include/vendored-cli/ignition/utils/cli/Split.hpp +++ /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/cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp b/cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp deleted file mode 100644 index eefeeb2..0000000 --- a/cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp +++ /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/cli/include/vendored-cli/ignition/utils/cli/Timer.hpp b/cli/include/vendored-cli/ignition/utils/cli/Timer.hpp deleted file mode 100644 index d38b2fd..0000000 --- a/cli/include/vendored-cli/ignition/utils/cli/Timer.hpp +++ /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/cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp b/cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp deleted file mode 100644 index 37b7729..0000000 --- a/cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp +++ /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/cli/include/vendored-cli/ignition/utils/cli/Validators.hpp b/cli/include/vendored-cli/ignition/utils/cli/Validators.hpp deleted file mode 100644 index c44e321..0000000 --- a/cli/include/vendored-cli/ignition/utils/cli/Validators.hpp +++ /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/cli/include/vendored-cli/ignition/utils/cli/Version.hpp b/cli/include/vendored-cli/ignition/utils/cli/Version.hpp deleted file mode 100644 index 3116862..0000000 --- a/cli/include/vendored-cli/ignition/utils/cli/Version.hpp +++ /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/include/CMakeLists.txt b/include/CMakeLists.txt index 992a131..a35a047 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,2 +1 @@ add_subdirectory(gz) -install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/include/ignition/utils.hh b/include/ignition/utils.hh deleted file mode 100644 index 49f773f..0000000 --- a/include/ignition/utils.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/include/ignition/utils/Environment.hh b/include/ignition/utils/Environment.hh deleted file mode 100644 index 14a1527..0000000 --- a/include/ignition/utils/Environment.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/include/ignition/utils/Export.hh b/include/ignition/utils/Export.hh deleted file mode 100644 index 2bfa8b2..0000000 --- a/include/ignition/utils/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/include/ignition/utils/ExtraTestMacros.hh b/include/ignition/utils/ExtraTestMacros.hh deleted file mode 100644 index 59a0142..0000000 --- a/include/ignition/utils/ExtraTestMacros.hh +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2020 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_UTILS_TEST_DISABLED_ON_WIN32(TestName) \ - GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(TestName) - -#define IGN_UTILS_TEST_DISABLED_ON_MAC(TestName) \ - GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(TestName) - -#define IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(TestName) \ - GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(TestName) diff --git a/include/ignition/utils/ImplPtr.hh b/include/ignition/utils/ImplPtr.hh deleted file mode 100644 index 187c5ea..0000000 --- a/include/ignition/utils/ImplPtr.hh +++ /dev/null @@ -1,31 +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 - -#define IGN_UTILS_IMPL_PTR_FWD(ImplementationClass, memberName) \ - GZ_UTILS_IMPL_PTR_FWD(ImplementationClass, memberName) - -#define IGN_UTILS_UNIQUE_IMPL_PTR_FWD(ImplementationClass, memberName) \ - GZ_UTILS_UNIQUE_IMPL_PTR_FWD(ImplementationClass, memberName) - -#define IGN_UTILS_IMPL_PTR(memberName) \ - GZ_UTILS_IMPL_PTR(memberName) - -#define IGN_UTILS_UNIQUE_IMPL_PTR(memberName) \ - GZ_UTILS_UNIQUE_IMPL_PTR(memberName) diff --git a/include/ignition/utils/NeverDestroyed.hh b/include/ignition/utils/NeverDestroyed.hh deleted file mode 100644 index d779060..0000000 --- a/include/ignition/utils/NeverDestroyed.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/include/ignition/utils/SuppressWarning.hh b/include/ignition/utils/SuppressWarning.hh deleted file mode 100644 index f3cdbcb..0000000 --- a/include/ignition/utils/SuppressWarning.hh +++ /dev/null @@ -1,49 +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 - -#ifndef IGN_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR - #define IGN_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR \ - DETAIL_GZ_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR -#endif - -#ifndef IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR - #define IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR \ - DETAIL_GZ_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR -#endif - -#ifndef IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING - #define IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING \ - DETAIL_GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING -#endif - -#ifndef IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING - #define IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING \ - DETAIL_GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING -#endif - -#ifndef IGN_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION - #define IGN_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION \ - DETAIL_GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION -#endif - -#ifndef IGN_UTILS_WARN_RESUME__DEPRECATED_DECLARATION - #define IGN_UTILS_WARN_RESUME__DEPRECATED_DECLARATION \ - DETAIL_GZ_UTILS_WARN_RESUME__DEPRECATED_DECLARATION -#endif diff --git a/include/ignition/utils/config.hh b/include/ignition/utils/config.hh deleted file mode 100644 index 7e57fc7..0000000 --- a/include/ignition/utils/config.hh +++ /dev/null @@ -1,46 +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_UTILS__CONFIG_HH_ -#define IGNITION_UTILS__CONFIG_HH_ - -#include - -#define IGNITION_UTILS_MAJOR_VERSION GZ_UTILS_MAJOR_VERSION -#define IGNITION_UTILS_MINOR_VERSION GZ_UTILS_MINOR_VERSION -#define IGNITION_UTILS_PATCH_VERSION GZ_UTILS_PATCH_VERSION - -#define IGNITION_UTILS_VERSION GZ_UTILS_VERSION -#define IGNITION_UTILS_VERSION_FULL GZ_UTILS_VERSION_FULL - -#define IGNITION_UTILS_VERSION_NAMESPACE GZ_UTILS_VERSION_NAMESPACE - -#define IGNITION_UTILS_VERSION_HEADER GZ_UTILS_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/include/ignition/utils/detail/DefaultOps.hh b/include/ignition/utils/detail/DefaultOps.hh deleted file mode 100644 index d3d5c33..0000000 --- a/include/ignition/utils/detail/DefaultOps.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/include/ignition/utils/detail/Export.hh b/include/ignition/utils/detail/Export.hh deleted file mode 100644 index 42f3056..0000000 --- a/include/ignition/utils/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/include/ignition/utils/detail/ExtraTestMacros.hh b/include/ignition/utils/detail/ExtraTestMacros.hh deleted file mode 100644 index 317ff8f..0000000 --- a/include/ignition/utils/detail/ExtraTestMacros.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2020 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/include/ignition/utils/detail/ImplPtr.hh b/include/ignition/utils/detail/ImplPtr.hh deleted file mode 100644 index 6b0448b..0000000 --- a/include/ignition/utils/detail/ImplPtr.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/include/ignition/utils/detail/SuppressWarning.hh b/include/ignition/utils/detail/SuppressWarning.hh deleted file mode 100644 index 28e4912..0000000 --- a/include/ignition/utils/detail/SuppressWarning.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/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc deleted file mode 100644 index ec4bf8d..0000000 --- a/test/integration/deprecated_TEST.cc +++ /dev/null @@ -1,34 +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 -#include - -///////////////////////////////////////////////// -// Make sure the ignition namespace still works -TEST(Deprecated, IgnitionNamespace) -{ - auto impl = ignition::utils::MakeImpl(); - ignition::utils::NeverDestroyed neverDestroyed; -} - -#undef SUPPRESS_IGNITION_HEADER_DEPRECATION