Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ign -> gz Namespace Migration : gz-cmake #256

Merged
merged 3 commits into from
May 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ release will remove the deprecated code.
**Replacement**: include/ignition/utils/ExtraTestMacros.hh
1. **Deprecated**: CMake functions and macros starting with `ign_`
**Replacement**: CMake functions and macros starting with `gz_`
1. **Deprecated**: `ignition` namespaces
**Replacement**: `gz` namespaces
2 changes: 1 addition & 1 deletion doc/doxygen/api.in
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,7 @@ INPUT_FILTER =
# need to set EXTENSION_MAPPING for the extension otherwise the files are not
# properly processed by doxygen.

FILTER_PATTERNS = *.hh="sed -e 's/inline\snamespace\s.*\s{$\|ignition::@IGN_DESIGNATION@::\|IGN_DEPRECATED([0-9\.]\+)\|IGNITION_@IGN_DESIGNATION_UPPER@_VISIBLE//g'"
FILTER_PATTERNS = *.hh="sed -e 's/inline\snamespace\s.*\s{$\|gz::@IGN_DESIGNATION@::\|IGN_DEPRECATED([0-9\.]\+)\|IGNITION_@IGN_DESIGNATION_UPPER@_VISIBLE//g'"

# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
# INPUT_FILTER) will also be used to filter the input files that are used for
Expand Down
2 changes: 1 addition & 1 deletion examples/comp_deps/src/AlmostEmpty.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <ignition/component_deps/Export.hh>

namespace ignition
namespace gz
{
namespace component_deps
{
Expand Down
2 changes: 1 addition & 1 deletion examples/core_nodep/src/AlmostEmpty.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <ignition/core_no_deps/Export.hh>

namespace ignition
namespace gz
{
namespace core_no_deps
{
Expand Down
2 changes: 1 addition & 1 deletion examples/core_nodep_static/src/AlmostEmpty.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <ignition/core_no_deps_static/Export.hh>

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

#ifndef IGNITION_UTILITIES_SUPPRESSWARNING_HH_
#define IGNITION_UTILITIES_SUPPRESSWARNING_HH_
#ifndef GZ_UTILITIES_SUPPRESSWARNING_HH_
#define GZ_UTILITIES_SUPPRESSWARNING_HH_

#include <ignition/utilities/detail/SuppressWarning.hh>

Expand Down
4 changes: 2 additions & 2 deletions include/ignition/utilities/detail/SuppressWarning.hh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*/


#ifndef IGNITION_UTILITIES_DETAIL_SUPPRESSWARNING_HH_
#define IGNITION_UTILITIES_DETAIL_SUPPRESSWARNING_HH_
#ifndef GZ_UTILITIES_DETAIL_SUPPRESSWARNING_HH_
#define GZ_UTILITIES_DETAIL_SUPPRESSWARNING_HH_

#include <ignition/utilities/SuppressWarning.hh>

Expand Down