From cdd48b33405fe42f400f8ca1238115c0bcd265e3 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Sat, 28 May 2022 08:05:00 -0700 Subject: [PATCH] ign -> gz: namespaces, docs (#61) Signed-off-by: methylDragon Co-authored-by: Louise Poubel --- CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 2 +- Changelog.md | 66 +++---- Migration.md | 12 +- README.md | 34 ++-- api.md.in | 2 +- cli/README.md | 2 +- .../external-cli/ignition/utils/cli/App.hpp | 1 + .../external-cli/ignition/utils/cli/CLI.hpp | 1 + .../ignition/utils/cli/Config.hpp | 1 + .../ignition/utils/cli/ConfigFwd.hpp | 1 + .../external-cli/ignition/utils/cli/Error.hpp | 1 + .../ignition/utils/cli/Formatter.hpp | 1 + .../ignition/utils/cli/FormatterFwd.hpp | 1 + .../ignition/utils/cli/Macros.hpp | 1 + .../ignition/utils/cli/Option.hpp | 1 + .../external-cli/ignition/utils/cli/Split.hpp | 1 + .../ignition/utils/cli/StringTools.hpp | 1 + .../external-cli/ignition/utils/cli/Timer.hpp | 1 + .../ignition/utils/cli/TypeTools.hpp | 1 + .../ignition/utils/cli/Validators.hpp | 1 + .../ignition/utils/cli/Version.hpp | 1 + cli/include/ignition/utils/cli.hh | 1 + .../ignition/utils/cli/IgnitionFormatter.hpp | 1 + .../vendored-cli/ignition/utils/cli/App.hpp | 1 + .../vendored-cli/ignition/utils/cli/CLI.hpp | 1 + .../ignition/utils/cli/Config.hpp | 1 + .../ignition/utils/cli/ConfigFwd.hpp | 1 + .../vendored-cli/ignition/utils/cli/Error.hpp | 1 + .../ignition/utils/cli/Formatter.hpp | 1 + .../ignition/utils/cli/FormatterFwd.hpp | 1 + .../ignition/utils/cli/Macros.hpp | 1 + .../ignition/utils/cli/Option.hpp | 1 + .../vendored-cli/ignition/utils/cli/Split.hpp | 1 + .../ignition/utils/cli/StringTools.hpp | 1 + .../vendored-cli/ignition/utils/cli/Timer.hpp | 1 + .../ignition/utils/cli/TypeTools.hpp | 1 + .../ignition/utils/cli/Validators.hpp | 1 + .../ignition/utils/cli/Version.hpp | 1 + examples/using_cli/CMakeLists.txt | 2 +- include/gz/utils/Environment.hh | 5 +- include/gz/utils/ExtraTestMacros.hh | 6 +- include/gz/utils/ImplPtr.hh | 8 +- include/gz/utils/NeverDestroyed.hh | 16 +- include/gz/utils/SuppressWarning.hh | 12 +- include/gz/utils/config.hh.in | 6 +- include/gz/utils/detail/DefaultOps.hh | 5 +- include/gz/utils/detail/ExtraTestMacros.hh | 20 +-- include/gz/utils/detail/ImplPtr.hh | 4 +- include/gz/utils/detail/SuppressWarning.hh | 170 +++++++++--------- include/ignition/utils.hh | 1 + include/ignition/utils/Environment.hh | 1 + include/ignition/utils/Export.hh | 1 + include/ignition/utils/ExtraTestMacros.hh | 1 + include/ignition/utils/ImplPtr.hh | 1 + include/ignition/utils/NeverDestroyed.hh | 1 + include/ignition/utils/SuppressWarning.hh | 1 + include/ignition/utils/config.hh | 18 +- include/ignition/utils/detail/DefaultOps.hh | 1 + include/ignition/utils/detail/Export.hh | 1 + .../ignition/utils/detail/ExtraTestMacros.hh | 1 + include/ignition/utils/detail/ImplPtr.hh | 1 + .../ignition/utils/detail/SuppressWarning.hh | 1 + src/Environment.cc | 2 +- src/Environment_TEST.cc | 2 +- src/NeverDestroyed_TEST.cc | 10 +- .../all_symbols_have_version.bash.in | 4 +- test/integration/deprecated_TEST.cc | 34 ++++ test/integration/implptr/ImplPtr_TEST.cc | 2 +- .../implptr/implptr_test_classes.cc | 6 +- .../implptr/implptr_test_classes.hh | 4 +- tutorials/installation.md | 8 +- 72 files changed, 299 insertions(+), 209 deletions(-) create mode 100644 test/integration/deprecated_TEST.cc diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 820e43f..65eec81 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -56,7 +56,7 @@ further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at [https://ignitionrobotics.org/support](https://ignitionrobotics.org/support). All +reported by contacting the project team at [https://gazebosim.org/support](https://gazebosim.org/support). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 147239c..a1c121e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1 @@ -See the [Ignition Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing). +See the [Gazebo contributing guide](https://gazebosim.org/docs/all/contributing). diff --git a/Changelog.md b/Changelog.md index 3623456..2893305 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,77 +1,77 @@ -## Ignition Utils 2.x +## Gazebo Utils 2.x -## Ignition Utils 2.0.0 (20XX-XX-XX) +## Gazebo Utils 2.0.0 (20XX-XX-XX) -## Ignition Utils 1.x +## Gazebo Utils 1.x -## Ignition Utils 1.4.0 (2022-03-29) +## Gazebo Utils 1.4.0 (2022-03-29) 1. Enable cpplint - * [Pull request #41](https://github.com/ignitionrobotics/ign-utils/pull/41) + * [Pull request #41](https://github.com/gazebosim/gz-utils/pull/41) 1. Add doxygen linters - * [Pull request #44](https://github.com/ignitionrobotics/ign-utils/pull/44) + * [Pull request #44](https://github.com/gazebosim/gz-utils/pull/44) -1. Custom Ignition CLI11 formatter - * [Pull request #42](https://github.com/ignitionrobotics/ign-utils/pull/42) +1. Custom Gazebo CLI11 formatter + * [Pull request #42](https://github.com/gazebosim/gz-utils/pull/42) 1. Drop all main functions from gtest files - * [Pull request #45](https://github.com/ignitionrobotics/ign-utils/pull/45) + * [Pull request #45](https://github.com/gazebosim/gz-utils/pull/45) 1. Improvements to enable "-Wconversion" - * [Pull request #46](https://github.com/ignitionrobotics/ign-utils/pull/46) + * [Pull request #46](https://github.com/gazebosim/gz-utils/pull/46) -## Ignition Utils 1.3.0 (2022-02-24) +## Gazebo Utils 1.3.0 (2022-02-24) 1. Fix inline namespace issue with clang6 - * [Pull request #39](https://github.com/ignitionrobotics/ign-utils/pull/39) + * [Pull request #39](https://github.com/gazebosim/gz-utils/pull/39) 1. Move ExtraTestMacros from ign-cmake - * [Pull request #37](https://github.com/ignitionrobotics/ign-utils/pull/37) + * [Pull request #37](https://github.com/gazebosim/gz-utils/pull/37) -## Ignition Utils 1.2.0 (2022-01-28) +## Gazebo Utils 1.2.0 (2022-01-28) 1. Enable cpplint on focal - * [Pull request #32](https://github.com/ignitionrobotics/ign-utils/pull/32) + * [Pull request #32](https://github.com/gazebosim/gz-utils/pull/32) 1. Add NeverDestroyed utility class - * [Pull request #31](https://github.com/ignitionrobotics/ign-utils/pull/31) + * [Pull request #31](https://github.com/gazebosim/gz-utils/pull/31) 1. Move environment functionality to utils - * [Pull request #30](https://github.com/ignitionrobotics/ign-utils/pull/30) + * [Pull request #30](https://github.com/gazebosim/gz-utils/pull/30) 1. ImplPtr Get method - * [Pull request #27](https://github.com/ignitionrobotics/ign-utils/pull/27) + * [Pull request #27](https://github.com/gazebosim/gz-utils/pull/27) -## Ignition Utils 1.1.0 (2021-09-02) +## Gazebo Utils 1.1.0 (2021-09-02) 1. More complete bazel implementation - * [Pull request #21](https://github.com/ignitionrobotics/ign-utils/pull/21) + * [Pull request #21](https://github.com/gazebosim/gz-utils/pull/21) 1. Add IGN_UTILS_VENDOR_CLI11 CMake option to optionally use external CLI11 - * [Pull request #19](https://github.com/ignitionrobotics/ign-utils/pull/19) + * [Pull request #19](https://github.com/gazebosim/gz-utils/pull/19) 1. Add an example program using CLI11 - * [Pull request #23](https://github.com/ignitionrobotics/ign-utils/pull/23) + * [Pull request #23](https://github.com/gazebosim/gz-utils/pull/23) -## Ignition Utils 1.0.0 (2021-03-30) +## Gazebo Utils 1.0.0 (2021-03-30) 1. Add basic support for bazel build system. - * [Pull request #14](https://github.com/ignitionrobotics/ign-utils/pull/14) + * [Pull request #14](https://github.com/gazebosim/gz-utils/pull/14) -1. Ignition ImplPtr - * [Pull request 1](https://github.com/ignitionrobotics/ign-utils/pull/1) - * [Pull request 4](https://github.com/ignitionrobotics/ign-utils/pull/4) +1. Gazebo ImplPtr + * [Pull request 1](https://github.com/gazebosim/gz-utils/pull/1) + * [Pull request 4](https://github.com/gazebosim/gz-utils/pull/4) 1. Vendor CLI11 library inside ignition-utils - * [Pull request 2](https://github.com/ignitionrobotics/ign-utils/pull/2) + * [Pull request 2](https://github.com/gazebosim/gz-utils/pull/2) 1. Update warning suppression macros - * [Pull request 5](https://github.com/ignitionrobotics/ign-utils/pull/5) - * [Pull request 10](https://github.com/ignitionrobotics/ign-utils/pull/10) - * [Pull request 11](https://github.com/ignitionrobotics/ign-utils/pull/11) + * [Pull request 5](https://github.com/gazebosim/gz-utils/pull/5) + * [Pull request 10](https://github.com/gazebosim/gz-utils/pull/10) + * [Pull request 11](https://github.com/gazebosim/gz-utils/pull/11) 1. Pre-release cleanup - * [Pull request #16](https://github.com/ignitionrobotics/ign-utils/pull/16) - * [Pull request #15](https://github.com/ignitionrobotics/ign-utils/pull/15) + * [Pull request #16](https://github.com/gazebosim/gz-utils/pull/16) + * [Pull request #15](https://github.com/gazebosim/gz-utils/pull/15) diff --git a/Migration.md b/Migration.md index 2a50778..631e5ca 100644 --- a/Migration.md +++ b/Migration.md @@ -5,7 +5,15 @@ Deprecated code produces compile-time warnings. These warning serve as notification to users that their code should be upgraded. The next major release will remove the deprecated code. -## Ignition Utils 1.2 to 1.3 +## Gazebo Utils 1.X to 2.X + +* The `ignition` namespace is deprecated and will be removed in future versions. + Use `gz` instead. + +* Header files under `ignition/...` are deprecated and will be removed in future versions. + Use `gz/...` instead. + +## Gazebo Utils 1.2 to 1.3 Recommended migration: Utils 1.3.0 introduces the `ExtraTestMacros.hh` headers that are also in ign-cmake. @@ -13,4 +21,4 @@ This is an effort to remove all headers from ign-cmake and locate them in ign-ut To update, replace all instances of `ignition/utilities/ExtraTestMacros.hh` with `ignition/utils/ExtraTestMacros.hh` In the future, `ignition/utilities/ExtraTestMacros.hh` will be removed from ign-cmake. -## Ignition Utils 0.X to 1.X +## Gazebo Utils 0.X to 1.X diff --git a/README.md b/README.md index f1d938c..4836004 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,21 @@ -# Ignition Utils : Classes and functions for robot applications +# Gazebo Utils : Classes and functions for robot applications **Maintainer:** addisu AT openrobotics DOT org -[![GitHub open issues](https://img.shields.io/github/issues-raw/ignitionrobotics/ign-utils.svg)](https://github.com/ignitionrobotics/ign-utils/issues) -[![GitHub open pull requests](https://img.shields.io/github/issues-pr-raw/ignitionrobotics/ign-utils.svg)](https://github.com/ignitionrobotics/ign-utils/pulls) +[![GitHub open issues](https://img.shields.io/github/issues-raw/gazebosim/gz-utils.svg)](https://github.com/gazebosim/gz-utils/issues) +[![GitHub open pull requests](https://img.shields.io/github/issues-pr-raw/gazebosim/gz-utils.svg)](https://github.com/gazebosim/gz-utils/pulls) [![Discourse topics](https://img.shields.io/discourse/https/community.gazebosim.org/topics.svg)](https://community.gazebosim.org) [![Hex.pm](https://img.shields.io/hexpm/l/plug.svg)](https://www.apache.org/licenses/LICENSE-2.0) Build | Status -- | -- -Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-utils/branch/main/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-utils) +Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-utils/branch/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-utils) Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_utils-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_utils-ci-main-focal-amd64) Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_utils-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_utils-ci-main-homebrew-amd64) Windows | [![Build Status](https://build.osrfoundation.org/job/ign_utils-ci-win/badge/icon)](https://build.osrfoundation.org/job/ign_utils-ci-win/) -Ignition Utils, a component of [Ignition -Robotics](https://ignitionrobotics.org), provides general purpose +Gazebo Utils, a component of [Ignition +Robotics](https://gazebosim.org), provides general purpose classes and functions designed for robotic applications. # Table of Contents @@ -42,7 +42,7 @@ classes and functions designed for robotic applications. # Features -Ignition Utils provides a wide range of functionality, including: +Gazebo Utils provides a wide range of functionality, including: * A helper class to implement the PIMPL pattern * A command line parsing utility (vendored [CLI11](https://github.com/CLIUtils/CLI11/)) @@ -50,15 +50,15 @@ Ignition Utils provides a wide range of functionality, including: # Install -See the [installation tutorial](https://ignitionrobotics.org/api/utils/0.1/install.html). +See the [installation tutorial](https://gazebosim.org/api/utils/0.1/install.html). # Usage -Please refer to the [examples directory](https://github.com/ignitionrobotics/ign-utils/blob/main/examples/). +Please refer to the [examples directory](https://github.com/gazebosim/gz-utils/blob/main/examples/). # Documentation -API and tutorials can be found at [https://ignitionrobotics.org/libs/utils](https://ignitionrobotics.org/libs/utils). +API and tutorials can be found at [https://gazebosim.org/libs/utils](https://gazebosim.org/libs/utils). You can also generate the documentation from a clone of this repository by following these steps. @@ -71,7 +71,7 @@ You can also generate the documentation from a clone of this repository by follo 2. Clone the repository ``` - git clone https://github.com/ignitionrobotics/ign-utils + git clone https://github.com/gazebosim/gz-utils ``` 3. Configure and build the documentation. @@ -90,7 +90,7 @@ You can also generate the documentation from a clone of this repository by follo Follow these steps to run tests and static code analysis in your clone of this repository. -1. Follow the [source install instruction](https://ignitionrobotics.org/libs/utils#source-install). +1. Follow the [source install instruction](https://gazebosim.org/libs/utils#source-install). 2. Run tests. @@ -124,20 +124,20 @@ ign-utils # Contributing Please see -[CONTRIBUTING.md](https://ignitionrobotics.org/docs/all/contributing). +[CONTRIBUTING.md](https://gazebosim.org/docs/all/contributing). # Code of Conduct Please see -[CODE_OF_CONDUCT.md](https://github.com/ignitionrobotics/ign-utils/blob/main/CODE_OF_CONDUCT.md) +[CODE_OF_CONDUCT.md](https://github.com/gazebosim/gz-utils/blob/main/CODE_OF_CONDUCT.md) # Versioning This library uses [Semantic Versioning](https://semver.org/). Additionally, this library is part of the -[Ignition project](https://ignitionrobotics.org) which periodically +[Ignition project](https://gazebosim.org) which periodically releases a versioned set of compatible and complimentary libraries. See the -[Ignition website](https://ignitionrobotics.org) for version and +[Ignition website](https://gazebosim.org) for version and release information. # License @@ -145,6 +145,6 @@ release information. This library is licensed under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0). See also the -[LICENSE](https://github.com/ignitionrobotics/ign-utils/blob/main/LICENSE) +[LICENSE](https://github.com/gazebosim/gz-utils/blob/main/LICENSE) file. diff --git a/api.md.in b/api.md.in index 92e891e..a85d2ea 100644 --- a/api.md.in +++ b/api.md.in @@ -1,6 +1,6 @@ ## Ignition @IGN_DESIGNATION_CAP@ -Ignition @IGN_DESIGNATION_CAP@ is a component in Ignition Robotics, a set of +Ignition @IGN_DESIGNATION_CAP@ is a component in Gazebo, a set of libraries designed to rapidly develop robot and simulation applications. This library defines a general set of utilities with an eye toward simulation and robotics. diff --git a/cli/README.md b/cli/README.md index cc68195..99efba1 100644 --- a/cli/README.md +++ b/cli/README.md @@ -1,4 +1,4 @@ -Ignition CLI component +Gazebo CLI component Vendored from https://github.com/CLIUtils/CLI11/ diff --git a/cli/include/external-cli/ignition/utils/cli/App.hpp b/cli/include/external-cli/ignition/utils/cli/App.hpp index 9490920..241e127 100644 --- a/cli/include/external-cli/ignition/utils/cli/App.hpp +++ b/cli/include/external-cli/ignition/utils/cli/App.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/external-cli/ignition/utils/cli/CLI.hpp b/cli/include/external-cli/ignition/utils/cli/CLI.hpp index 301b501..a6c61ce 100644 --- a/cli/include/external-cli/ignition/utils/cli/CLI.hpp +++ b/cli/include/external-cli/ignition/utils/cli/CLI.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Config.hpp b/cli/include/external-cli/ignition/utils/cli/Config.hpp index c678f13..08af9ed 100644 --- a/cli/include/external-cli/ignition/utils/cli/Config.hpp +++ b/cli/include/external-cli/ignition/utils/cli/Config.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp b/cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp index 005bb71..cfa4b9e 100644 --- a/cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp +++ b/cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Error.hpp b/cli/include/external-cli/ignition/utils/cli/Error.hpp index b3d44a0..2e92e7a 100644 --- a/cli/include/external-cli/ignition/utils/cli/Error.hpp +++ b/cli/include/external-cli/ignition/utils/cli/Error.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Formatter.hpp b/cli/include/external-cli/ignition/utils/cli/Formatter.hpp index c914eed..602a41b 100644 --- a/cli/include/external-cli/ignition/utils/cli/Formatter.hpp +++ b/cli/include/external-cli/ignition/utils/cli/Formatter.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp b/cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp index b2a6329..9a53355 100644 --- a/cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp +++ b/cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Macros.hpp b/cli/include/external-cli/ignition/utils/cli/Macros.hpp index 953f04b..7df60ec 100644 --- a/cli/include/external-cli/ignition/utils/cli/Macros.hpp +++ b/cli/include/external-cli/ignition/utils/cli/Macros.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Option.hpp b/cli/include/external-cli/ignition/utils/cli/Option.hpp index 804c0a1..fa3a95a 100644 --- a/cli/include/external-cli/ignition/utils/cli/Option.hpp +++ b/cli/include/external-cli/ignition/utils/cli/Option.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Split.hpp b/cli/include/external-cli/ignition/utils/cli/Split.hpp index 2de6ebb..68de086 100644 --- a/cli/include/external-cli/ignition/utils/cli/Split.hpp +++ b/cli/include/external-cli/ignition/utils/cli/Split.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/external-cli/ignition/utils/cli/StringTools.hpp b/cli/include/external-cli/ignition/utils/cli/StringTools.hpp index 6e2e6c7..8bdaa63 100644 --- a/cli/include/external-cli/ignition/utils/cli/StringTools.hpp +++ b/cli/include/external-cli/ignition/utils/cli/StringTools.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Timer.hpp b/cli/include/external-cli/ignition/utils/cli/Timer.hpp index c5ee409..4753fc3 100644 --- a/cli/include/external-cli/ignition/utils/cli/Timer.hpp +++ b/cli/include/external-cli/ignition/utils/cli/Timer.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/external-cli/ignition/utils/cli/TypeTools.hpp b/cli/include/external-cli/ignition/utils/cli/TypeTools.hpp index d3a1139..bd0e783 100644 --- a/cli/include/external-cli/ignition/utils/cli/TypeTools.hpp +++ b/cli/include/external-cli/ignition/utils/cli/TypeTools.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Validators.hpp b/cli/include/external-cli/ignition/utils/cli/Validators.hpp index 5a50ab7..e4336c2 100644 --- a/cli/include/external-cli/ignition/utils/cli/Validators.hpp +++ b/cli/include/external-cli/ignition/utils/cli/Validators.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Version.hpp b/cli/include/external-cli/ignition/utils/cli/Version.hpp index fe0216f..c018f60 100644 --- a/cli/include/external-cli/ignition/utils/cli/Version.hpp +++ b/cli/include/external-cli/ignition/utils/cli/Version.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/ignition/utils/cli.hh b/cli/include/ignition/utils/cli.hh index 7b6a63e..ab4ffbe 100644 --- a/cli/include/ignition/utils/cli.hh +++ b/cli/include/ignition/utils/cli.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/ignition/utils/cli/IgnitionFormatter.hpp b/cli/include/ignition/utils/cli/IgnitionFormatter.hpp index 90c31a6..f86d2e8 100644 --- a/cli/include/ignition/utils/cli/IgnitionFormatter.hpp +++ b/cli/include/ignition/utils/cli/IgnitionFormatter.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/App.hpp b/cli/include/vendored-cli/ignition/utils/cli/App.hpp index 1d214d7..505fec9 100644 --- a/cli/include/vendored-cli/ignition/utils/cli/App.hpp +++ b/cli/include/vendored-cli/ignition/utils/cli/App.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/CLI.hpp b/cli/include/vendored-cli/ignition/utils/cli/CLI.hpp index d3c666c..dc49d80 100644 --- a/cli/include/vendored-cli/ignition/utils/cli/CLI.hpp +++ b/cli/include/vendored-cli/ignition/utils/cli/CLI.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Config.hpp b/cli/include/vendored-cli/ignition/utils/cli/Config.hpp index 60eab0f..c6f8da4 100644 --- a/cli/include/vendored-cli/ignition/utils/cli/Config.hpp +++ b/cli/include/vendored-cli/ignition/utils/cli/Config.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp b/cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp index 1d9c576..2827c90 100644 --- a/cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp +++ b/cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Error.hpp b/cli/include/vendored-cli/ignition/utils/cli/Error.hpp index b042135..83a6b36 100644 --- a/cli/include/vendored-cli/ignition/utils/cli/Error.hpp +++ b/cli/include/vendored-cli/ignition/utils/cli/Error.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp b/cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp index 26799c9..0286346 100644 --- a/cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp +++ b/cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp b/cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp index 638e4c2..f8fe406 100644 --- a/cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp +++ b/cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Macros.hpp b/cli/include/vendored-cli/ignition/utils/cli/Macros.hpp index f85a594..d19f485 100644 --- a/cli/include/vendored-cli/ignition/utils/cli/Macros.hpp +++ b/cli/include/vendored-cli/ignition/utils/cli/Macros.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Option.hpp b/cli/include/vendored-cli/ignition/utils/cli/Option.hpp index 119d67d..9e99c1d 100644 --- a/cli/include/vendored-cli/ignition/utils/cli/Option.hpp +++ b/cli/include/vendored-cli/ignition/utils/cli/Option.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Split.hpp b/cli/include/vendored-cli/ignition/utils/cli/Split.hpp index 707fdb0..b38693c 100644 --- a/cli/include/vendored-cli/ignition/utils/cli/Split.hpp +++ b/cli/include/vendored-cli/ignition/utils/cli/Split.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp b/cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp index 7780fdc..eefeeb2 100644 --- a/cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp +++ b/cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Timer.hpp b/cli/include/vendored-cli/ignition/utils/cli/Timer.hpp index ab8cd9a..d38b2fd 100644 --- a/cli/include/vendored-cli/ignition/utils/cli/Timer.hpp +++ b/cli/include/vendored-cli/ignition/utils/cli/Timer.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp b/cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp index 5fae20b..37b7729 100644 --- a/cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp +++ b/cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Validators.hpp b/cli/include/vendored-cli/ignition/utils/cli/Validators.hpp index 83acda9..c44e321 100644 --- a/cli/include/vendored-cli/ignition/utils/cli/Validators.hpp +++ b/cli/include/vendored-cli/ignition/utils/cli/Validators.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Version.hpp b/cli/include/vendored-cli/ignition/utils/cli/Version.hpp index ce0731c..3116862 100644 --- a/cli/include/vendored-cli/ignition/utils/cli/Version.hpp +++ b/cli/include/vendored-cli/ignition/utils/cli/Version.hpp @@ -16,3 +16,4 @@ */ #include +#include diff --git a/examples/using_cli/CMakeLists.txt b/examples/using_cli/CMakeLists.txt index 26964bc..3dcac14 100644 --- a/examples/using_cli/CMakeLists.txt +++ b/examples/using_cli/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) project(ignition-utils-cli-demo) -# Find the Ignition Libraries used directly by the example +# Find the Gazebo Libraries used directly by the example find_package(ignition-utils2 REQUIRED COMPONENTS cli) set(IGN_UTILS_VER ${ignition-utils2_VERSION_MAJOR}) diff --git a/include/gz/utils/Environment.hh b/include/gz/utils/Environment.hh index 7e034d8..8ac06a4 100644 --- a/include/gz/utils/Environment.hh +++ b/include/gz/utils/Environment.hh @@ -23,7 +23,7 @@ #include -namespace ignition +namespace gz { namespace utils { @@ -68,7 +68,6 @@ bool GZ_UTILS_VISIBLE unsetenv(const std::string &_name); } } // namespace utils -} // namespace ignition +} // namespace gz #endif // GZ_UTILS_ENVIRONMENT_HH_ - diff --git a/include/gz/utils/ExtraTestMacros.hh b/include/gz/utils/ExtraTestMacros.hh index 625d21b..07ef557 100644 --- a/include/gz/utils/ExtraTestMacros.hh +++ b/include/gz/utils/ExtraTestMacros.hh @@ -26,7 +26,7 @@ /// by googletest. See /// https://chromium.googlesource.com/external/github.com/google/googletest/+/HEAD/googletest/docs/advanced.md #define IGN_UTILS_TEST_DISABLED_ON_WIN32(TestName) \ - DETAIL_IGN_UTILS_TEST_DISABLED_ON_WIN32(TestName) + DETAIL_GZ_UTILS_TEST_DISABLED_ON_WIN32(TestName) /// \brief Restrict the execution of the test for the Mac platform. /// The test will be compiled on Windows too but will never be run as @@ -34,7 +34,7 @@ /// by googletest. See /// https://chromium.googlesource.com/external/github.com/google/googletest/+/HEAD/googletest/docs/advanced.md #define IGN_UTILS_TEST_DISABLED_ON_MAC(TestName) \ - DETAIL_IGN_UTILS_TEST_DISABLED_ON_MAC(TestName) + DETAIL_GZ_UTILS_TEST_DISABLED_ON_MAC(TestName) /// \brief Restrict the execution of the test to just the Linux platform /// Other platforms will get the test compiled but it won't be run @@ -42,6 +42,6 @@ /// The macro uses the Disabled_ prefix provided by googletest. See /// https://chromium.googlesource.com/external/github.com/google/googletest/+/HEAD/googletest/docs/advanced.md #define IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(TestName) \ - DETAIL_IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(TestName) + DETAIL_GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(TestName) #endif // GZ_UTILS_EXTRATESTMACROS_HH diff --git a/include/gz/utils/ImplPtr.hh b/include/gz/utils/ImplPtr.hh index dfc8881..d791061 100644 --- a/include/gz/utils/ImplPtr.hh +++ b/include/gz/utils/ImplPtr.hh @@ -25,7 +25,7 @@ #include #include -namespace ignition +namespace gz { namespace utils { @@ -226,20 +226,20 @@ namespace ignition template UniqueImplPtr MakeUniqueImpl(Args &&..._args); } // namespace utils -} // namespace ignition +} // namespace gz /// \brief Add a private ImplPtr to a class as dataPtr. /// This variant takes a forward-declared ImplementationClass as the impl. #define IGN_UTILS_IMPL_PTR_FWD(ImplementationClass, memberName) \ IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING \ - private: ::ignition::utils::ImplPtr memberName; \ + private: ::gz::utils::ImplPtr memberName; \ IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING /// \brief Add a private UniqueImplPtr to a class as dataPtr. /// This variant takes a forward-declared ImplementationClass as the impl. #define IGN_UTILS_UNIQUE_IMPL_PTR_FWD(ImplementationClass, memberName) \ IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING \ - private: ::ignition::utils::UniqueImplPtr memberName; \ + private: ::gz::utils::UniqueImplPtr memberName; \ IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING /// \brief Add a private ImplPtr to a class as dataPtr. diff --git a/include/gz/utils/NeverDestroyed.hh b/include/gz/utils/NeverDestroyed.hh index 8537a79..7325cfe 100644 --- a/include/gz/utils/NeverDestroyed.hh +++ b/include/gz/utils/NeverDestroyed.hh @@ -22,15 +22,14 @@ #include #include -namespace ignition +namespace gz { namespace utils { - /// Originally copied from https://github.com/RobotLocomotion/drake/blob/v0.36.0/common/never_destroyed.h /// Originally licensed BSD 3-Clause (https://github.com/RobotLocomotion/drake/blob/v0.36.0/LICENSE.TXT) /// Re-licensed Apache-2.0 with permission from: -/// jwnimmer-tri (https://github.com/ignitionrobotics/ign-utils/pull/31#issuecomment-989173512) +/// jwnimmer-tri (https://github.com/gazebosim/gz-utils/pull/31#issuecomment-989173512) /// /// Wraps an underlying type T such that its storage is a direct member field /// of this object (i.e., without any indirection into the heap), but *unlike* @@ -62,11 +61,11 @@ namespace utils /// /// static Singleton& getInstance() /// { -/// static ignition::utils::NeverDestroyed instance; +/// static gz::utils::NeverDestroyed instance; /// return instance.access(); /// } /// private: -/// friend ignition::utils::NeverDestroyed; +/// friend gz::utils::NeverDestroyed; /// Singleton() = default; /// }; /// @endcode @@ -78,7 +77,7 @@ namespace utils /// Foo ParseFoo(const std::string& foo_string) /// { /// using Dict = std::unordered_map; -/// static const ignition::utils::NeverDestroyed string_to_enum +/// static const gz::utils::NeverDestroyed string_to_enum /// { /// std::initializer_list /// { @@ -95,7 +94,7 @@ namespace utils /// @code /// const std::vector& GetConstantMagicNumbers() /// { -/// static const ignition::utils::NeverDestroyed> result +/// static const gz::utils::NeverDestroyed> result /// { /// []() /// { @@ -155,8 +154,7 @@ class NeverDestroyed private: typename std::aligned_storage::type storage; }; - } // namespace utils -} // namespace ignition +} // namespace gz #endif // GZ_UTILS_NEVERDESTROYED_HH_ diff --git a/include/gz/utils/SuppressWarning.hh b/include/gz/utils/SuppressWarning.hh index af9d72d..44e778d 100644 --- a/include/gz/utils/SuppressWarning.hh +++ b/include/gz/utils/SuppressWarning.hh @@ -50,12 +50,12 @@ /// derived type. #ifndef IGN_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR #define IGN_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR \ - DETAIL_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_IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR + DETAIL_GZ_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR #endif /// \brief Microsoft Visual Studio does not automatically export the interface @@ -65,24 +65,24 @@ /// information to the DLL interface. #ifndef IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING #define IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING \ - DETAIL_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_IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING + DETAIL_GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING #endif /// \brief Use this to suppress deprecation warnings. This may be useful when /// retaining tests for deprecated methods to preserve code coverage. #ifndef IGN_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION #define IGN_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION \ - DETAIL_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_IGN_UTILS_WARN_RESUME__DEPRECATED_DECLARATION + DETAIL_GZ_UTILS_WARN_RESUME__DEPRECATED_DECLARATION #endif // TODO(anyone): Add more warning types as they become relevant. diff --git a/include/gz/utils/config.hh.in b/include/gz/utils/config.hh.in index 891a97a..60984a8 100644 --- a/include/gz/utils/config.hh.in +++ b/include/gz/utils/config.hh.in @@ -30,10 +30,6 @@ #define GZ_UTILS_VERSION_NAMESPACE v${PROJECT_VERSION_MAJOR} -#define GZ_UTILS_VERSION_HEADER "Ignition ${IGN_DESIGNATION}, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2020 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" - -#cmakedefine IGNITION_UTILS_BUILD_TYPE_PROFILE 1 -#cmakedefine IGNITION_UTILS_BUILD_TYPE_DEBUG 1 -#cmakedefine IGNITION_UTILS_BUILD_TYPE_RELEASE 1 +#define GZ_UTILS_VERSION_HEADER "Gazebo Utils, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2020 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" #endif diff --git a/include/gz/utils/detail/DefaultOps.hh b/include/gz/utils/detail/DefaultOps.hh index 16b09e7..5690281 100644 --- a/include/gz/utils/detail/DefaultOps.hh +++ b/include/gz/utils/detail/DefaultOps.hh @@ -20,7 +20,7 @@ #include -namespace ignition +namespace gz { namespace utils { @@ -78,7 +78,6 @@ namespace ignition }; } // namespace detail } // namespace utils -} // namespace ignition +} // namespace gz #endif // GZ_UTILS__DETAIL__DEFAULTOPS_HH_ - diff --git a/include/gz/utils/detail/ExtraTestMacros.hh b/include/gz/utils/detail/ExtraTestMacros.hh index c24c408..e8c5434 100644 --- a/include/gz/utils/detail/ExtraTestMacros.hh +++ b/include/gz/utils/detail/ExtraTestMacros.hh @@ -20,41 +20,41 @@ #include -#define DETAIL_IGN_UTILS_ADD_DISABLED_PREFIX(x) DISABLED_##x +#define DETAIL_GZ_UTILS_ADD_DISABLED_PREFIX(x) DISABLED_##x #if defined _WIN32 - #define DETAIL_IGN_UTILS_TEST_DISABLED_ON_WIN32(TestName) \ - DETAIL_IGN_UTILS_ADD_DISABLED_PREFIX(TestName) + #define DETAIL_GZ_UTILS_TEST_DISABLED_ON_WIN32(TestName) \ + DETAIL_GZ_UTILS_ADD_DISABLED_PREFIX(TestName) #else - #define DETAIL_IGN_UTILS_TEST_DISABLED_ON_WIN32(TestName) \ + #define DETAIL_GZ_UTILS_TEST_DISABLED_ON_WIN32(TestName) \ TestName #endif // defined _WIN32 #if defined __APPLE__ - #define DETAIL_IGN_UTILS_TEST_DISABLED_ON_MAC(TestName) \ - DETAIL_IGN_UTILS_ADD_DISABLED_PREFIX(TestName) + #define DETAIL_GZ_UTILS_TEST_DISABLED_ON_MAC(TestName) \ + DETAIL_GZ_UTILS_ADD_DISABLED_PREFIX(TestName) #else - #define DETAIL_IGN_UTILS_TEST_DISABLED_ON_MAC(TestName) \ + #define DETAIL_GZ_UTILS_TEST_DISABLED_ON_MAC(TestName) \ TestName #endif // defined __APPLE__ #if defined __linux__ - #define DETAIL_IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(TestName) \ + #define DETAIL_GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(TestName) \ TestName #else - #define DETAIL_IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(TestName) \ - DETAIL_IGN_UTILS_ADD_DISABLED_PREFIX(TestName) + #define DETAIL_GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(TestName) \ + DETAIL_GZ_UTILS_ADD_DISABLED_PREFIX(TestName) #endif // defined __linux__ diff --git a/include/gz/utils/detail/ImplPtr.hh b/include/gz/utils/detail/ImplPtr.hh index 65dcf71..bdcecb4 100644 --- a/include/gz/utils/detail/ImplPtr.hh +++ b/include/gz/utils/detail/ImplPtr.hh @@ -22,7 +22,7 @@ #include -namespace ignition +namespace gz { namespace utils { @@ -146,6 +146,6 @@ namespace ignition &detail::DefaultDelete); } } // namespace utils -} // namespace ignition +} // namespace gz #endif // GZ_UTILS__DETAIL__IMPLPTR_HH_ diff --git a/include/gz/utils/detail/SuppressWarning.hh b/include/gz/utils/detail/SuppressWarning.hh index bcfcb22..b4bf3ce 100644 --- a/include/gz/utils/detail/SuppressWarning.hh +++ b/include/gz/utils/detail/SuppressWarning.hh @@ -20,8 +20,8 @@ #include -#ifndef DETAIL_IGN_UTILS_STRINGIFY - #define DETAIL_IGN_UTILS_STRINGIFY(x) #x +#ifndef DETAIL_GZ_UTILS_STRINGIFY + #define DETAIL_GZ_UTILS_STRINGIFY(x) #x #endif /* cppcheck-suppress */ @@ -30,26 +30,26 @@ #if defined __clang__ - #ifndef DETAIL_IGN_UTILS_BEGIN_WARN_SUP_PUSH - #define DETAIL_IGN_UTILS_BEGIN_WARN_SUP_PUSH \ + #ifndef DETAIL_GZ_UTILS_BEGIN_WARN_SUP_PUSH + #define DETAIL_GZ_UTILS_BEGIN_WARN_SUP_PUSH \ _Pragma("clang diagnostic push") #endif - #ifndef DETAIL_IGN_UTILS_WARN_SUP_HELPER_2 - #define DETAIL_IGN_UTILS_WARN_SUP_HELPER_2(w) \ - DETAIL_IGN_UTILS_STRINGIFY(clang diagnostic ignored w) + #ifndef DETAIL_GZ_UTILS_WARN_SUP_HELPER_2 + #define DETAIL_GZ_UTILS_WARN_SUP_HELPER_2(w) \ + DETAIL_GZ_UTILS_STRINGIFY(clang diagnostic ignored w) #endif - #ifndef DETAIL_IGN_UTILS_WARN_SUP_HELPER - #define DETAIL_IGN_UTILS_WARN_SUP_HELPER(w) \ - _Pragma(DETAIL_IGN_UTILS_WARN_SUP_HELPER_2(w)) + #ifndef DETAIL_GZ_UTILS_WARN_SUP_HELPER + #define DETAIL_GZ_UTILS_WARN_SUP_HELPER(w) \ + _Pragma(DETAIL_GZ_UTILS_WARN_SUP_HELPER_2(w)) #endif - #ifndef DETAIL_IGN_UTILS_WARN_RESUME - #define DETAIL_IGN_UTILS_WARN_RESUME \ + #ifndef DETAIL_GZ_UTILS_WARN_RESUME + #define DETAIL_GZ_UTILS_WARN_RESUME \ _Pragma("clang diagnostic pop") #endif @@ -61,26 +61,26 @@ // target the "correct" compiler, we should check if __clang__ is defined // before checking whether __GNUC__ is defined. - #ifndef DETAIL_IGN_UTILS_BEGIN_WARN_SUP_PUSH - #define DETAIL_IGN_UTILS_BEGIN_WARN_SUP_PUSH \ + #ifndef DETAIL_GZ_UTILS_BEGIN_WARN_SUP_PUSH + #define DETAIL_GZ_UTILS_BEGIN_WARN_SUP_PUSH \ _Pragma("GCC diagnostic push") #endif - #ifndef DETAIL_IGN_UTILS_WARN_SUP_HELPER_2 - #define DETAIL_IGN_UTILS_WARN_SUP_HELPER_2(w) \ - DETAIL_IGN_UTILS_STRINGIFY(GCC diagnostic ignored w) + #ifndef DETAIL_GZ_UTILS_WARN_SUP_HELPER_2 + #define DETAIL_GZ_UTILS_WARN_SUP_HELPER_2(w) \ + DETAIL_GZ_UTILS_STRINGIFY(GCC diagnostic ignored w) #endif - #ifndef DETAIL_IGN_UTILS_WARN_SUP_HELPER - #define DETAIL_IGN_UTILS_WARN_SUP_HELPER(w) \ - _Pragma(DETAIL_IGN_UTILS_WARN_SUP_HELPER_2(w)) + #ifndef DETAIL_GZ_UTILS_WARN_SUP_HELPER + #define DETAIL_GZ_UTILS_WARN_SUP_HELPER(w) \ + _Pragma(DETAIL_GZ_UTILS_WARN_SUP_HELPER_2(w)) #endif - #ifndef DETAIL_IGN_UTILS_WARN_RESUME - #define DETAIL_IGN_UTILS_WARN_RESUME \ + #ifndef DETAIL_GZ_UTILS_WARN_RESUME + #define DETAIL_GZ_UTILS_WARN_RESUME \ _Pragma("GCC diagnostic pop") #endif @@ -88,20 +88,20 @@ #elif defined _MSC_VER - #ifndef DETAIL_IGN_UTILS_BEGIN_WARN_SUP_PUSH - #define DETAIL_IGN_UTILS_BEGIN_WARN_SUP_PUSH \ + #ifndef DETAIL_GZ_UTILS_BEGIN_WARN_SUP_PUSH + #define DETAIL_GZ_UTILS_BEGIN_WARN_SUP_PUSH \ __pragma(warning(push)) #endif - #ifndef DETAIL_IGN_UTILS_WARN_SUP_HELPER - #define DETAIL_IGN_UTILS_WARN_SUP_HELPER(w) \ + #ifndef DETAIL_GZ_UTILS_WARN_SUP_HELPER + #define DETAIL_GZ_UTILS_WARN_SUP_HELPER(w) \ __pragma(warning(disable: w)) #endif - #ifndef DETAIL_IGN_UTILS_WARN_RESUME - #define DETAIL_IGN_UTILS_WARN_RESUME \ + #ifndef DETAIL_GZ_UTILS_WARN_RESUME + #define DETAIL_GZ_UTILS_WARN_RESUME \ __pragma(warning(pop)) #endif @@ -110,28 +110,28 @@ // Make these into no-ops if we don't know the type of compiler - #ifndef DETAIL_IGN_UTILS_BEGIN_WARN_SUP_PUSH - #define DETAIL_IGN_UTILS_BEGIN_WARN_SUP_PUSH + #ifndef DETAIL_GZ_UTILS_BEGIN_WARN_SUP_PUSH + #define DETAIL_GZ_UTILS_BEGIN_WARN_SUP_PUSH #endif - #ifndef DETAIL_IGN_UTILS_WARN_SUP_HELPER - #define DETAIL_IGN_UTILS_WARN_SUP_HELPER(w) + #ifndef DETAIL_GZ_UTILS_WARN_SUP_HELPER + #define DETAIL_GZ_UTILS_WARN_SUP_HELPER(w) #endif - #ifndef DETAIL_IGN_UTILS_WARN_RESUME - #define DETAIL_IGN_UTILS_WARN_RESUME + #ifndef DETAIL_GZ_UTILS_WARN_RESUME + #define DETAIL_GZ_UTILS_WARN_RESUME #endif #endif -#ifndef DETAIL_IGN_UTILS_BEGIN_WARNING_SUPPRESSION - #define DETAIL_IGN_UTILS_BEGIN_WARNING_SUPPRESSION(warning_token) \ - DETAIL_IGN_UTILS_BEGIN_WARN_SUP_PUSH \ - DETAIL_IGN_UTILS_WARN_SUP_HELPER(warning_token) +#ifndef DETAIL_GZ_UTILS_BEGIN_WARNING_SUPPRESSION + #define DETAIL_GZ_UTILS_BEGIN_WARNING_SUPPRESSION(warning_token) \ + DETAIL_GZ_UTILS_BEGIN_WARN_SUP_PUSH \ + DETAIL_GZ_UTILS_WARN_SUP_HELPER(warning_token) #endif @@ -139,71 +139,71 @@ // Warning Tokens #if defined __GNUC__ || defined __clang__ - #ifndef DETAIL_IGN_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR - #define DETAIL_IGN_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR \ - DETAIL_IGN_UTILS_BEGIN_WARNING_SUPPRESSION("-Wdelete-non-virtual-dtor") + #ifndef DETAIL_GZ_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR + #define DETAIL_GZ_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR \ + DETAIL_GZ_UTILS_BEGIN_WARNING_SUPPRESSION("-Wdelete-non-virtual-dtor") #endif - #ifndef DETAIL_IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR - #define DETAIL_IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR \ - DETAIL_IGN_UTILS_WARN_RESUME + #ifndef DETAIL_GZ_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR + #define DETAIL_GZ_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR \ + DETAIL_GZ_UTILS_WARN_RESUME #endif // There is no analogous warning for this in GCC or Clang so we just make // blank macros for this warning type. - #ifndef DETAIL_IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING - #define DETAIL_IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING + #ifndef DETAIL_GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING + #define DETAIL_GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING #endif - #ifndef DETAIL_IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING - #define DETAIL_IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING + #ifndef DETAIL_GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING + #define DETAIL_GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING #endif - #ifndef DETAIL_IGN_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION - #define DETAIL_IGN_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION \ - DETAIL_IGN_UTILS_BEGIN_WARNING_SUPPRESSION("-Wdeprecated-declarations") + #ifndef DETAIL_GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION + #define DETAIL_GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION \ + DETAIL_GZ_UTILS_BEGIN_WARNING_SUPPRESSION("-Wdeprecated-declarations") #endif - #ifndef DETAIL_IGN_UTILS_WARN_RESUME__DEPRECATED_DECLARATION - #define DETAIL_IGN_UTILS_WARN_RESUME__DEPRECATED_DECLARATION \ - DETAIL_IGN_UTILS_WARN_RESUME + #ifndef DETAIL_GZ_UTILS_WARN_RESUME__DEPRECATED_DECLARATION + #define DETAIL_GZ_UTILS_WARN_RESUME__DEPRECATED_DECLARATION \ + DETAIL_GZ_UTILS_WARN_RESUME #endif #elif defined _MSC_VER - #ifndef DETAIL_IGN_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR - #define DETAIL_IGN_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR \ - DETAIL_IGN_UTILS_BEGIN_WARNING_SUPPRESSION(4265) \ - DETAIL_IGN_UTILS_BEGIN_WARNING_SUPPRESSION(5205) + #ifndef DETAIL_GZ_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR + #define DETAIL_GZ_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR \ + DETAIL_GZ_UTILS_BEGIN_WARNING_SUPPRESSION(4265) \ + DETAIL_GZ_UTILS_BEGIN_WARNING_SUPPRESSION(5205) #endif - #ifndef DETAIL_IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR - #define DETAIL_IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR \ - DETAIL_IGN_UTILS_WARN_RESUME + #ifndef DETAIL_GZ_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR + #define DETAIL_GZ_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR \ + DETAIL_GZ_UTILS_WARN_RESUME #endif - #ifndef DETAIL_IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING - #define DETAIL_IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING \ - DETAIL_IGN_UTILS_BEGIN_WARNING_SUPPRESSION(4251) + #ifndef DETAIL_GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING + #define DETAIL_GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING \ + DETAIL_GZ_UTILS_BEGIN_WARNING_SUPPRESSION(4251) #endif - #ifndef DETAIL_IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING - #define DETAIL_IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING \ - DETAIL_IGN_UTILS_WARN_RESUME + #ifndef DETAIL_GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING + #define DETAIL_GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING \ + DETAIL_GZ_UTILS_WARN_RESUME #endif - #ifndef DETAIL_IGN_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION - #define DETAIL_IGN_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION \ - DETAIL_IGN_UTILS_BEGIN_WARNING_SUPPRESSION(4996) + #ifndef DETAIL_GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION + #define DETAIL_GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION \ + DETAIL_GZ_UTILS_BEGIN_WARNING_SUPPRESSION(4996) #endif - #ifndef DETAIL_IGN_UTILS_WARN_RESUME__DEPRECATED_DECLARATION - #define DETAIL_IGN_UTILS_WARN_RESUME__DEPRECATED_DECLARATION \ - DETAIL_IGN_UTILS_WARN_RESUME + #ifndef DETAIL_GZ_UTILS_WARN_RESUME__DEPRECATED_DECLARATION + #define DETAIL_GZ_UTILS_WARN_RESUME__DEPRECATED_DECLARATION \ + DETAIL_GZ_UTILS_WARN_RESUME #endif @@ -212,27 +212,27 @@ // If the compiler is unknown, we simply leave these macros blank to avoid // compilation errors. - #ifndef DETAIL_IGN_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR - #define DETAIL_IGN_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR + #ifndef DETAIL_GZ_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR + #define DETAIL_GZ_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR #endif - #ifndef DETAIL_IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR - #define DETAIL_IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR + #ifndef DETAIL_GZ_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR + #define DETAIL_GZ_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR #endif - #ifndef DETAIL_IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING - #define DETAIL_IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING + #ifndef DETAIL_GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING + #define DETAIL_GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING #endif - #ifndef DETAIL_IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING - #define DETAIL_IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING + #ifndef DETAIL_GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING + #define DETAIL_GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING #endif - #ifndef DETAIL_IGN_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION - #define DETAIL_IGN_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION + #ifndef DETAIL_GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION + #define DETAIL_GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION #endif - #ifndef DETAIL_IGN_UTILS_WARN_RESUME__DEPRECATED_DECLARATION - #define DETAIL_IGN_UTILS_WARN_RESUME__DEPRECATED_DECLARATION + #ifndef DETAIL_GZ_UTILS_WARN_RESUME__DEPRECATED_DECLARATION + #define DETAIL_GZ_UTILS_WARN_RESUME__DEPRECATED_DECLARATION #endif diff --git a/include/ignition/utils.hh b/include/ignition/utils.hh index 2c876fa..49f773f 100644 --- a/include/ignition/utils.hh +++ b/include/ignition/utils.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/utils/Environment.hh b/include/ignition/utils/Environment.hh index d58de5d..1d3292b 100644 --- a/include/ignition/utils/Environment.hh +++ b/include/ignition/utils/Environment.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/utils/Export.hh b/include/ignition/utils/Export.hh index 1632fb2..2bfa8b2 100644 --- a/include/ignition/utils/Export.hh +++ b/include/ignition/utils/Export.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/utils/ExtraTestMacros.hh b/include/ignition/utils/ExtraTestMacros.hh index 875855e..06b8d4d 100644 --- a/include/ignition/utils/ExtraTestMacros.hh +++ b/include/ignition/utils/ExtraTestMacros.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/utils/ImplPtr.hh b/include/ignition/utils/ImplPtr.hh index 17f0df5..36b5284 100644 --- a/include/ignition/utils/ImplPtr.hh +++ b/include/ignition/utils/ImplPtr.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/utils/NeverDestroyed.hh b/include/ignition/utils/NeverDestroyed.hh index aeaeb3a..ae92886 100644 --- a/include/ignition/utils/NeverDestroyed.hh +++ b/include/ignition/utils/NeverDestroyed.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/utils/SuppressWarning.hh b/include/ignition/utils/SuppressWarning.hh index 8b7d4c3..6c66290 100644 --- a/include/ignition/utils/SuppressWarning.hh +++ b/include/ignition/utils/SuppressWarning.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/utils/config.hh b/include/ignition/utils/config.hh index e47e286..7e57fc7 100644 --- a/include/ignition/utils/config.hh +++ b/include/ignition/utils/config.hh @@ -15,10 +15,10 @@ * */ -#include +#ifndef IGNITION_UTILS__CONFIG_HH_ +#define IGNITION_UTILS__CONFIG_HH_ -#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 @@ -31,4 +31,16 @@ #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 index d9f4fc6..d3d5c33 100644 --- a/include/ignition/utils/detail/DefaultOps.hh +++ b/include/ignition/utils/detail/DefaultOps.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/utils/detail/Export.hh b/include/ignition/utils/detail/Export.hh index 08bafa2..42f3056 100644 --- a/include/ignition/utils/detail/Export.hh +++ b/include/ignition/utils/detail/Export.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/utils/detail/ExtraTestMacros.hh b/include/ignition/utils/detail/ExtraTestMacros.hh index b048f54..317ff8f 100644 --- a/include/ignition/utils/detail/ExtraTestMacros.hh +++ b/include/ignition/utils/detail/ExtraTestMacros.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/utils/detail/ImplPtr.hh b/include/ignition/utils/detail/ImplPtr.hh index 2041ed9..6b0448b 100644 --- a/include/ignition/utils/detail/ImplPtr.hh +++ b/include/ignition/utils/detail/ImplPtr.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/utils/detail/SuppressWarning.hh b/include/ignition/utils/detail/SuppressWarning.hh index 27059c3..28e4912 100644 --- a/include/ignition/utils/detail/SuppressWarning.hh +++ b/include/ignition/utils/detail/SuppressWarning.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/src/Environment.cc b/src/Environment.cc index 8258fb6..73c996c 100644 --- a/src/Environment.cc +++ b/src/Environment.cc @@ -21,7 +21,7 @@ #include -namespace ignition +namespace gz { namespace utils { diff --git a/src/Environment_TEST.cc b/src/Environment_TEST.cc index 1671704..604fb3d 100644 --- a/src/Environment_TEST.cc +++ b/src/Environment_TEST.cc @@ -19,7 +19,7 @@ #include -using namespace ignition; +using namespace gz; ///////////////////////////////////////////////// TEST(Environment, emptyENV) diff --git a/src/NeverDestroyed_TEST.cc b/src/NeverDestroyed_TEST.cc index 1e8bd5b..c8d48c8 100644 --- a/src/NeverDestroyed_TEST.cc +++ b/src/NeverDestroyed_TEST.cc @@ -63,7 +63,7 @@ GTEST_TEST(NeverDestroyed, NoBoomTest) try { { - ignition::utils::NeverDestroyed foo; + gz::utils::NeverDestroyed foo; } ASSERT_TRUE(true); } @@ -83,11 +83,11 @@ class Singleton public: void operator=(Singleton &&) = delete; public: static Singleton &getInstance() { - static ignition::utils::NeverDestroyed instance; + static gz::utils::NeverDestroyed instance; return instance.Access(); } - private: friend ignition::utils::NeverDestroyed; + private: friend gz::utils::NeverDestroyed; private: Singleton() = default; }; @@ -108,7 +108,7 @@ enum class Foo Foo ParseFoo(const std::string &foo_string) { using Dict = std::unordered_map; - static const ignition::utils::NeverDestroyed string_to_enum{ + static const gz::utils::NeverDestroyed string_to_enum{ std::initializer_list{ {"bar", Foo::kBar}, {"baz", Foo::kBaz}, @@ -127,7 +127,7 @@ GTEST_TEST(NeverDestroyedExample, ParseFoo) using Result = std::vector; const Result &GetConstantMagicNumbers() { - static const ignition::utils::NeverDestroyed result{ + static const gz::utils::NeverDestroyed result{ []() { Result prototype; diff --git a/test/integration/all_symbols_have_version.bash.in b/test/integration/all_symbols_have_version.bash.in index 9be67a7..f950725 100644 --- a/test/integration/all_symbols_have_version.bash.in +++ b/test/integration/all_symbols_have_version.bash.in @@ -5,7 +5,7 @@ VERSIONED_NS=v@PROJECT_VERSION_MAJOR@ IGN_PROJECT=@IGN_DESIGNATION@ # Sanity check - there should be at least one symbol -NUM_SYMBOLS=$(nm $LIBPATH | grep -e "ignition.*$IGN_PROJECT" | wc -l) +NUM_SYMBOLS=$(nm $LIBPATH | grep -e "gz.*$IGN_PROJECT" | wc -l) if [ $NUM_SYMBOLS -eq 0 ] then @@ -14,7 +14,7 @@ then fi # There must be no unversioned symbols -UNVERSIONED_SYMBOLS=$(nm $LIBPATH | grep -e "ignition.*$IGN_PROJECT" | grep -e "$VERSIONED_NS" -v) +UNVERSIONED_SYMBOLS=$(nm $LIBPATH | grep -e "gz.*$IGN_PROJECT" | grep -e "$VERSIONED_NS" -v) UNVERSIONED_SYMBOL_CHARS=$(printf "$UNVERSIONED_SYMBOLS" | wc -m) if [ $UNVERSIONED_SYMBOL_CHARS -ne 0 ] diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc new file mode 100644 index 0000000..ec4bf8d --- /dev/null +++ b/test/integration/deprecated_TEST.cc @@ -0,0 +1,34 @@ +/* + * 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 diff --git a/test/integration/implptr/ImplPtr_TEST.cc b/test/integration/implptr/ImplPtr_TEST.cc index f2268ea..3154421 100644 --- a/test/integration/implptr/ImplPtr_TEST.cc +++ b/test/integration/implptr/ImplPtr_TEST.cc @@ -20,7 +20,7 @@ #include #include "implptr_test_classes.hh" -using namespace ignition::implptr_test_classes; +using namespace gz::implptr_test_classes; ///////////////////////////////////////////////// TEST(ImplPtr, CopyConstruct) diff --git a/test/integration/implptr/implptr_test_classes.cc b/test/integration/implptr/implptr_test_classes.cc index fa4672e..1d13a78 100644 --- a/test/integration/implptr/implptr_test_classes.cc +++ b/test/integration/implptr/implptr_test_classes.cc @@ -20,10 +20,10 @@ #include #include -using namespace ignition; -using namespace ignition::implptr_test_classes; +using namespace gz; +using namespace gz::implptr_test_classes; -class ignition::implptr_test_classes::ObjectPrivate +class gz::implptr_test_classes::ObjectPrivate { public: void TestFunc() { diff --git a/test/integration/implptr/implptr_test_classes.hh b/test/integration/implptr/implptr_test_classes.hh index 540a28a..a1e0fce 100644 --- a/test/integration/implptr/implptr_test_classes.hh +++ b/test/integration/implptr/implptr_test_classes.hh @@ -24,7 +24,7 @@ #include #include -namespace ignition +namespace gz { namespace implptr_test_classes { @@ -117,6 +117,6 @@ namespace ignition }; } // namespace implptr_test_classes -} // namespace ignition +} // namespace gz #endif // GZ_UTILS_TEST_IMPLPTR_TEST_CLASSES_HH_ diff --git a/tutorials/installation.md b/tutorials/installation.md index e9c0a6f..499aa47 100644 --- a/tutorials/installation.md +++ b/tutorials/installation.md @@ -2,7 +2,7 @@ # Overview -This tutorial describes how to install Ignition Utils on Linux, Mac OS X and +This tutorial describes how to install Gazebo Utils on Linux, Mac OS X and Windows via either a binary distribution or from source. [Install](#install) @@ -37,7 +37,7 @@ Setup keys: wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add - ``` -Install Ignition Utils: +Install Gazebo Utils: ``` sudo apt install libignition-utils<#>-dev @@ -61,7 +61,7 @@ necessary prerequisites followed by building from source. 2. Clone the repository ``` - git clone https://github.com/ignitionrobotics/ign-utils -b ign-utils<#> + git clone https://github.com/gazebosim/gz-utils -b ign-utils<#> ``` Be sure to replace `<#>` with a number value, such as 1 or 2, depending on which version you need. @@ -79,7 +79,7 @@ necessary prerequisites followed by building from source. cd ign-utils; mkdir build; cd build; cmake ..; make ``` -5. Optionally, install Ignition Utils +5. Optionally, install Gazebo Utils ``` sudo make install