swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-08-04 04:16:02 -04:00
Code Issues Projects Releases Wiki Activity

[apathy] [PATCH] Replace boost:shared_ptr with std::shared_ptr

Browse Source
This commit is contained in:
DarthArgus
2016-07-25 05:26:57 +00:00
parent 00fa2c450b
commit c9abbf1771
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedGame/src/shared/core/WearableEntry.cpp
+2 -2
View File
@@ -91,8 +91,8 @@ namespace Archive
get(source, isWeapon);
if (isWeapon)
{
target.m_weaponSharedBaselines = boost::shared_ptr<const BaselinesMessage>(new BaselinesMessage(source));
target.m_weaponSharedNpBaselines = boost::shared_ptr<const BaselinesMessage>(new BaselinesMessage(source));
target.m_weaponSharedBaselines = std::make_shared<const BaselinesMessage>(source);
target.m_weaponSharedNpBaselines = std::make_shared<const BaselinesMessage>(source);
}
}
engine/shared/library/sharedGame/src/shared/core/WearableEntry.h
+4 -3
View File
@@ -13,7 +13,8 @@
#include "Archive/AutoByteStream.h"
#include "sharedFoundation/NetworkId.h"
#include "sharedNetworkMessages/BaselinesMessage.h"
#include "boost/smart_ptr.hpp"
#include <memory>
class WearableEntry;
@@ -42,8 +43,8 @@ class WearableEntry
int m_arrangement;
NetworkId m_networkId;
int m_objectTemplate;
boost::shared_ptr<const BaselinesMessage> m_weaponSharedBaselines;
boost::shared_ptr<const BaselinesMessage> m_weaponSharedNpBaselines;
std::shared_ptr<const BaselinesMessage> m_weaponSharedBaselines;
std::shared_ptr<const BaselinesMessage> m_weaponSharedNpBaselines;
bool operator==(const WearableEntry&) const;