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.

Sign up for GitHub

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

Jump to bottom

5 ➡️ 4 - EnumIface: suppress deprecation warning (#540) #600

Closed
wants to merge 8 commits into from
Closed

5 ➡️ 4 - EnumIface: suppress deprecation warning (#540) #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1e1c34b
EnumIface: suppress deprecation warning (#540)
scpeters Oct 8, 2023
c95da7c
Include SuppressWarning from utils
Crola1702 Apr 26, 2024
25fda70
Change header to ignition
Crola1702 Apr 26, 2024
c336c7b
Link core library publicly to gz-utils
scpeters Apr 29, 2024
a2cfb85
Change include header to gz
Crola1702 May 2, 2024
51926a6
Update src/CMakeLists.txt
Crola1702 May 8, 2024
4b07733
Merge branch 'ign-common4' into Crola1702/5_to_4_25-04-2024
Crola1702 May 8, 2024
6a20624
Remove extra space
Crola1702 May 8, 2024
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
3 changes: 3 additions & 0 deletions include/gz/common/EnumIface.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <gz/common/config.hh>
#include <gz/common/Export.hh>
#include <gz/common/Util.hh>
#include <gz/utils/SuppressWarning.hh>

namespace ignition
{
Expand Down Expand Up @@ -146,6 +147,7 @@ namespace ignition
_Pragma("clang diagnostic push")
_Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
#endif
IGN_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION
template<typename Enum>
class EnumIterator
: std::iterator<std::bidirectional_iterator_tag, Enum>
Expand Down Expand Up @@ -223,6 +225,7 @@ namespace ignition
/// member value ever used.
private: Enum c;
};
IGN_UTILS_WARN_RESUME__DEPRECATED_DECLARATION
#if defined __APPLE__ && defined __clang__
_Pragma("clang diagnostic pop")
#endif
Expand Down
6 changes: 5 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ ign_create_core_library(

# Link the libraries that we always need
target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
PRIVATE ${DL_TARGET})
PRIVATE
${DL_TARGET}
PUBLIC
ignition-utils${IGN_UTILS_VER}::ignition-utils${IGN_UTILS_VER}
)

# This is required by the WorkerPool::WaitForResults(const Time &_timeout)
# TODO(anyone): IGN_DEPRECATED(4). Remove this part when the method is removed
Expand Down
Loading