diff options
| author | flow <flowlnlnln@gmail.com> | 2022-11-01 19:48:26 -0300 |
|---|---|---|
| committer | flow <flowlnlnln@gmail.com> | 2022-11-01 19:48:26 -0300 |
| commit | 7956e6f04e32448b0043a49ff08873e117ba0a0b (patch) | |
| tree | a451fa409e400f3c9cc27715df3be7abc2ca043e /launcher/meta/Version.cpp | |
| parent | f6a3fa55b1fb4b10780065fd8e1df722cd40efd8 (diff) | |
| download | PrismLauncher-7956e6f04e32448b0043a49ff08873e117ba0a0b.tar.gz PrismLauncher-7956e6f04e32448b0043a49ff08873e117ba0a0b.tar.bz2 PrismLauncher-7956e6f04e32448b0043a49ff08873e117ba0a0b.zip | |
fix: don't use forward-declared Ptr types in meta/
This would cause ODR violations when those headers were included in
other places that also included stuff like "Version.h" (note the
"meta/Version.h"), which can cause problems, especially in LTO.
Signed-off-by: flow <flowlnlnln@gmail.com>
Diffstat (limited to 'launcher/meta/Version.cpp')
| -rw-r--r-- | launcher/meta/Version.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/launcher/meta/Version.cpp b/launcher/meta/Version.cpp index a8dc3169..68cfa55c 100644 --- a/launcher/meta/Version.cpp +++ b/launcher/meta/Version.cpp @@ -54,7 +54,7 @@ void Meta::Version::parse(const QJsonObject& obj) parseVersion(obj, this); } -void Meta::Version::mergeFromList(const Meta::VersionPtr& other) +void Meta::Version::mergeFromList(const Meta::Version::Ptr& other) { if(other->m_providesRecommendations) { @@ -85,7 +85,7 @@ void Meta::Version::mergeFromList(const Meta::VersionPtr& other) } } -void Meta::Version::merge(const VersionPtr &other) +void Meta::Version::merge(const Version::Ptr &other) { mergeFromList(other); if(other->m_data) |