mirror of
https://github.com/SWG-Source/src.git
synced 2026-08-01 01:16:03 -04:00
tidies some things up and removes SOE memory manager overriding
This commit is contained in:
@@ -40,12 +40,6 @@ ObjvarBuffer::~ObjvarBuffer()
|
||||
{
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Loads all the object variables for the remembered objectId's
|
||||
*/
|
||||
|
||||
bool ObjvarBuffer::load(DB::Session *session,const DB::TagSet &tags, const std::string &schema, bool usingGoldDatabase)
|
||||
{
|
||||
int rowsFetched;
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "sharedFoundation/DynamicVariableList.h"
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include <memory>
|
||||
// ======================================================================
|
||||
|
||||
class ObjectTableBuffer;
|
||||
@@ -61,6 +61,9 @@ public:
|
||||
int m_nameId;
|
||||
|
||||
IndexKey(const NetworkId &objectId, int nameId);
|
||||
~IndexKey(){
|
||||
m_nameId = 0;
|
||||
}
|
||||
bool operator==(const IndexKey &rhs) const;
|
||||
bool operator<(const IndexKey &rhs) const;
|
||||
};
|
||||
@@ -71,6 +74,12 @@ public:
|
||||
std::string m_value;
|
||||
bool m_detached;
|
||||
bool m_inDatabase;
|
||||
~ObjvarValue(){
|
||||
m_type = 0;
|
||||
m_detached = 0;
|
||||
m_inDatabase = 0;
|
||||
m_value.clear();
|
||||
}
|
||||
};
|
||||
|
||||
typedef std::map<IndexKey,ObjvarValue> DataType;
|
||||
|
||||
@@ -141,6 +141,7 @@ SwgSnapshot::SwgSnapshot(DB::ModeQuery::Mode mode, bool useGoldDatabase) :
|
||||
|
||||
SwgSnapshot::~SwgSnapshot()
|
||||
{
|
||||
m_objvarBuffer.~ObjvarBuffer();
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
#include "SwgDatabaseServer/Schema.h"
|
||||
#include "SwgDatabaseServer/ScriptBuffer.h"
|
||||
#include "SwgDatabaseServer/WaypointBuffer.h"
|
||||
|
||||
namespace DB
|
||||
{
|
||||
class Session;
|
||||
|
||||
Reference in New Issue
Block a user