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

[Playback] Remove deprecated macro #5231

Merged
merged 1 commit into from
Jan 29, 2025
Merged

[Playback] Remove deprecated macro #5231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Sofa/Component/Playback/src/sofa/component/playback/CompareState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ void CompareState::draw(const core::visual::VisualParams* vparams)
CompareStateCreator::CompareStateCreator(const core::ExecParams* params)
: Visitor(params)
, sceneName("")
#if SOFAGENERALLOADER_HAVE_ZLIB
#if SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB
, extension(".txt.gz")
#else
, extension(".txt")
Expand All @@ -277,7 +277,7 @@ CompareStateCreator::CompareStateCreator(const core::ExecParams* params)
CompareStateCreator::CompareStateCreator(const std::string &n, const core::ExecParams* params, bool i, int c)
: Visitor(params)
, sceneName(n)
#if SOFAGENERALLOADER_HAVE_ZLIB
#if SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB
, extension(".txt.gz")
#else
, extension(".txt")
Expand Down
4 changes: 2 additions & 2 deletions Sofa/Component/Playback/src/sofa/component/playback/CompareTopology.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ void CompareTopology::processCompareTopology()
CompareTopologyCreator::CompareTopologyCreator(const core::ExecParams* params)
:Visitor(params)
, sceneName("")
#if SOFAGENERALLOADER_HAVE_ZLIB
#if SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB
, extension(".txt.gz")
#else
, extension(".txt")
Expand All @@ -312,7 +312,7 @@ CompareTopologyCreator::CompareTopologyCreator(const core::ExecParams* params)
CompareTopologyCreator::CompareTopologyCreator(const std::string &n, const core::ExecParams* params, bool i, int c)
:Visitor(params)
, sceneName(n)
#if SOFAGENERALLOADER_HAVE_ZLIB
#if SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB
, extension(".txt.gz")
#else
, extension(".txt")
Expand Down
9 changes: 0 additions & 9 deletions Sofa/Component/Playback/src/sofa/component/playback/config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,6 @@ namespace sofa::component::playback
constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@";
} // namespace sofa::component::playback

// Keep the previous macros
// This backward compatibility will be removed at v23.06
#ifndef SOFAGENERALLOADER_HAVE_ZLIB
#define SOFAGENERALLOADER_HAVE_ZLIB SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB
#endif
#ifndef SOFAEXPORTER_HAVE_ZLIB
#define SOFAEXPORTER_HAVE_ZLIB SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB
#endif

#ifdef SOFA_BUILD_SOFA_COMPONENT_PLAYBACK
#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK()
#else
Expand Down
Loading