mirror of
https://bitbucket.org/theswgsource/src-1.2.git
synced 2026-10-03 18:12:58 -04:00
persister cleanup (still broke but logic is there for when it isn't); also replace all the SOE BS for forwarding stl port with native object classes because i thought that may be part of the problem...
This commit is contained in:
@@ -27,9 +27,9 @@ namespace DataLintNamespace
|
||||
M_server
|
||||
};
|
||||
|
||||
typedef stdvector<std::string>::fwd StringList;
|
||||
typedef std::vector<std::string> StringList;
|
||||
typedef std::pair<std::string, std::pair<DataLint::AssetType, StringList> > WarningPair;
|
||||
typedef stdvector<WarningPair>::fwd WarningList;
|
||||
typedef std::vector<WarningPair> WarningList;
|
||||
typedef bool(*AssetFunction)(char const *);
|
||||
|
||||
bool ms_installed = false;
|
||||
|
||||
@@ -14,7 +14,7 @@ class DataLint
|
||||
{
|
||||
public:
|
||||
|
||||
typedef stdvector<std::pair<std::string, std::string> >::fwd StringPairList;
|
||||
typedef std::vector<std::pair<std::string, std::string> > StringPairList;
|
||||
|
||||
public:
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ private:
|
||||
|
||||
private:
|
||||
|
||||
typedef stdvector<Flag>::fwd FlagVector;
|
||||
typedef std::vector<Flag> FlagVector;
|
||||
|
||||
static FlagVector ms_flagsSortedByName;
|
||||
static FlagVector ms_flagsSortedByReportPriority;
|
||||
|
||||
@@ -41,7 +41,7 @@ private:
|
||||
bool operator <(const Flag &rhs) const;
|
||||
};
|
||||
|
||||
typedef stdvector<Flag>::fwd FlagVector;
|
||||
typedef std::vector<Flag> FlagVector;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -159,15 +159,15 @@ protected:
|
||||
static SendFunction ms_sendFunction;
|
||||
static IsReadyFunction ms_isReadyFunction;
|
||||
|
||||
typedef stdmap<uint32, Channel *>::fwd StreamMap;
|
||||
typedef std::map<uint32, Channel *> StreamMap;
|
||||
///stream names
|
||||
static StreamMap *ms_streams;
|
||||
|
||||
typedef stdmap<uint32, Channel *>::fwd VariableMap;
|
||||
typedef std::map<uint32, Channel *> VariableMap;
|
||||
///What variables are registered
|
||||
static VariableMap *ms_variables;
|
||||
|
||||
typedef stdmap<uint32, Channel *>::fwd StaticViewMap;
|
||||
typedef std::map<uint32, Channel *> StaticViewMap;
|
||||
///StaticView names
|
||||
static StaticViewMap *ms_staticViews;
|
||||
|
||||
@@ -184,10 +184,10 @@ protected:
|
||||
static bool ms_opened;
|
||||
|
||||
///What streaming channels are squelched (i.e. don't send to client at all)
|
||||
static stdmap<uint32, bool>::fwd *ms_squelchedStream;
|
||||
static std::map<uint32, bool> *ms_squelchedStream;
|
||||
|
||||
///What static channels are squelched (i.e. don't send to client at all)
|
||||
static stdmap<uint32, bool>::fwd *ms_squelchedStatic;
|
||||
static std::map<uint32, bool> *ms_squelchedStatic;
|
||||
|
||||
///the next stream number
|
||||
static uint32 ms_nextStream;
|
||||
@@ -198,10 +198,10 @@ protected:
|
||||
///the next staticView number
|
||||
static uint32 ms_nextStaticView;
|
||||
|
||||
typedef stdmap<uint32, Variable *>::fwd VariableValueMap;
|
||||
typedef std::map<uint32, Variable *> VariableValueMap;
|
||||
static VariableValueMap *ms_variableValues;
|
||||
|
||||
typedef stdmap<uint32, UpFunction>::fwd MovementFunctionMap;
|
||||
typedef std::map<uint32, UpFunction> MovementFunctionMap;
|
||||
static MovementFunctionMap *ms_upFunctionMap;
|
||||
static MovementFunctionMap *ms_downFunctionMap;
|
||||
static MovementFunctionMap *ms_leftFunctionMap;
|
||||
|
||||
@@ -24,7 +24,7 @@ class RemoteDebug::Channel
|
||||
void addChild(Channel *child);
|
||||
const std::string& name();
|
||||
private:
|
||||
typedef stdlist<Channel *>::fwd NodeList;
|
||||
typedef std::list<Channel *> NodeList;
|
||||
///its children
|
||||
NodeList* m_children;
|
||||
///the fully qualified name of the channel
|
||||
|
||||
Reference in New Issue
Block a user