Skip to content
This repository has been archived by the owner on Feb 3, 2025. It is now read-only.

Test if #3283 broke ABI by reverting it #3412

Merged
merged 1 commit into from
Dec 3, 2024
Merged
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
Revert "Remove GZ_SINGLETON_DECLARE definition workaround (fix for ar…
…mhf)"

This reverts commit e65ed2e.

Signed-off-by: Steve Peters <[email protected]>
scpeters committed Dec 3, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 075a17cc5795d891f4118a4e2157467f8f8ab80a
18 changes: 18 additions & 0 deletions gazebo/common/SingletonT.hh
Original file line number Diff line number Diff line change
@@ -69,5 +69,23 @@ class SingletonT
}
};

/// \brief Helper to declare typed SingletonT
// clang doesn't compile if it explicitly specializes a type before
// the type is defined. (forward declaration is not enough.)
#ifdef __clang__
#define GZ_SINGLETON_DECLARE(visibility, n1, n2, singletonType)
#else
#define GZ_SINGLETON_DECLARE(visibility, n1, n2, singletonType) \
namespace n1 \
{ \
namespace n2 \
{ \
class singletonType; \
} \
} \
template class visibility ::SingletonT<n1::n2::singletonType>;
#endif

/// \}

#endif