swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-02 17:13:09 -04:00
Code Issues Projects Releases Wiki Activity

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...

Browse Source
This commit is contained in:
DarthArgus
2016-12-10 23:17:06 +00:00
parent 688ab3fc9e
commit 8e94519082
450 changed files with 1287 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedFoundation/src/shared/ConfigFile.h
+3 -3
View File
@@ -43,7 +43,7 @@ public:
/// a buffer holding the entry string, which may be recast to other types
char *m_entry;
};
typedef stdlist<Element *>::fwd ElementList;
typedef std::list<Element *> ElementList;
// -----------------------------------------------------------------------
@@ -80,7 +80,7 @@ public:
/// track whether this was added lazily (not explicitly in the config file)
bool m_lazyAdd;
};
typedef stdmap<const char *, Key *, StringCompare>::fwd KeyMap;
typedef std::map<const char *, Key *, StringCompare> KeyMap;
// -----------------------------------------------------------------------
@@ -124,7 +124,7 @@ public:
///String representation of the section's name
char* m_name;
};
typedef stdmap<const char *, Section *, StringCompare>::fwd SectionMap;
typedef std::map<const char *, Section *, StringCompare> SectionMap;
public:
//public interface
engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp
+1 -1
View File
@@ -169,7 +169,7 @@ ConstCharCrcString const CrcStringTable::lookUp(uint32 crc) const
// ----------------------------------------------------------------------
void CrcStringTable::getAllStrings(stdvector<const char *>::fwd & strings) const
void CrcStringTable::getAllStrings(std::vector<const char *> & strings) const
{
strings.reserve(strings.size() + m_numberOfEntries);
engine/shared/library/sharedFoundation/src/shared/CrcStringTable.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
ConstCharCrcString const lookUp(const char * string) const;
ConstCharCrcString const lookUp(uint32 crc) const;
void getAllStrings(stdvector<const char *>::fwd & strings) const;
void getAllStrings(std::vector<const char *> & strings) const;
int getNumberOfStrings() const;
ConstCharCrcString const getString(int index) const;
engine/shared/library/sharedFoundation/src/shared/DebugInfoManager.h
+2 -2
View File
@@ -19,8 +19,8 @@ class Vector;
class DebugInfoManager
{
public:
typedef stdmap<std::string, Unicode::String>::fwd PropertySection;
typedef stdmap<std::string, PropertySection>::fwd PropertyMap;
typedef std::map<std::string, Unicode::String> PropertySection;
typedef std::map<std::string, PropertySection> PropertyMap;
public:
static void addProperty(PropertyMap & propertyMap, std::string const & section, std::string const & propertyName, int propertyValue);
engine/shared/library/sharedFoundation/src/shared/MessageQueue.h
+1 -1
View File
@@ -74,7 +74,7 @@ private:
private:
typedef stdvector<Message>::fwd MessageList;
typedef std::vector<Message> MessageList;
private:
engine/shared/library/sharedFoundation/src/shared/Scheduler.h
+2 -2
View File
@@ -91,8 +91,8 @@ private:
private:
stdvector<StaticCallbackEntry *>::fwd * deferredCallbackEntryAdditions;
stdpriority_queue<StaticCallbackEntry *, std::vector<StaticCallbackEntry *, std::allocator<StaticCallbackEntry *> >, StaticCallbackEntry::Compare>::fwd * callbackQueue;
std::vector<StaticCallbackEntry *> * deferredCallbackEntryAdditions;
std::priority_queue<StaticCallbackEntry *, std::vector<StaticCallbackEntry *, std::allocator<StaticCallbackEntry *> >, StaticCallbackEntry::Compare> * callbackQueue;
private:
engine/shared/library/sharedFoundation/src/shared/StaticCallbackEntry.h
+1 -1
View File
@@ -48,7 +48,7 @@ private:
private:
static stdvector<StaticCallbackEntry *>::fwd & getStaticCallbackFreeList();
static std::vector<StaticCallbackEntry *> & getStaticCallbackFreeList();
private:
engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h
+7 -125
View File
@@ -8,131 +8,13 @@
#ifndef INCLUDED_StlForwardDeclaration_H
#define INCLUDED_StlForwardDeclaration_H
// ======================================================================
// Setup handling for template value defaults that require accessing the
// {template type}::fwd value. gcc 3.2 requires typename here, gcc 2.95
// optionally accepts typename here, msvc 6 will not accept it here.
#if defined(PLATFORM_WIN32) || defined(WIN32)
#define FORWARD_TYPENAME
#elif defined(PLATFORM_LINUX)
#define FORWARD_TYPENAME typename
#else
#error unsupported platform
#endif
// ======================================================================
// grab stlport configuration
//#include "stl/config/features.h" // uncomment for newer stlport versions
//#include "stl/_config.h"
namespace std
{
template <class _Tp> struct less;
template <class _Tp> struct equal_to;
template <class _T1, class _T2> struct pair;
template <class _T1> struct hash;
template <class _Tp> class allocator;
template <class _CharT, class _Traits, class _Alloc> class basic_string;
template <class _CharT> struct char_traits;
template <size_t _Nb> class bitset;
template <class _Tp, class _Alloc> class deque;
template <class _Tp, class _Alloc> class list;
template <class _Tp, class _Alloc> class queue;
template <class _Tp, class _Alloc> class vector;
template <class _Tp, class _Sequence> class stack;
template <class _Tp, class _Container, class _Compare> class priority_queue;
template <class _Key, class _Tp, class _Compare, class _Alloc> class map;
//template <class _Key, class _Tp, class _HashFcn, class _Compare, class _Alloc> class hash_map;
template <class _Key, class _Tp, class _Compare, class _Alloc> class multimap;
template <class _Key, class _Compare, class _Alloc> class set;
//template <class _Key, class _HashFcn, class _Compare, class _Alloc> class hash_set;
template <class _Key, class _Compare, class _Alloc> class multiset;
typedef basic_string<char, char_traits<char>, allocator<char> > string;
template <class _Key, class _Tp, class _Hash, class _Compare, class _Alloc> class unordered_map;
template <class _Key, class _Hash, class _Compare, class _Alloc> class unordered_set;
}
template <class _Tp, class _Alloc = std::allocator<_Tp> > struct stddeque
{
typedef std::deque<_Tp, _Alloc> fwd;
};
template <class _Tp, class _Alloc = std::allocator<_Tp> > struct stdlist
{
typedef std::list<_Tp, _Alloc> fwd;
};
template <class _Key, class _Tp, class _Compare = std::less<_Key>, class _Alloc = std::allocator< std::pair <const _Key, _Tp> > > struct stdmap
{
typedef std::map<_Key, _Tp, _Compare, _Alloc> fwd;
};
//template <class _Key, class _Tp, class _HashFcn = std::hash<_Key>, class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator< std::pair <const _Key, _Tp> > > struct stdhash_map
//{
// typedef std::hash_map<_Key, _Tp, _HashFcn, _Compare, _Alloc> fwd;
//};
template <class _Key, class _Tp, class _HashFcn = std::hash<_Key>, class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator< std::pair <const _Key, _Tp> > > struct stdunordered_map
{
typedef std::unordered_map<_Key, _Tp, _HashFcn, _Compare, _Alloc> fwd;
};
template <class _Key, class _Tp, class _Compare = std::less<_Key>, class _Alloc = std::allocator< std::pair <const _Key, _Tp> > > struct stdmultimap
{
typedef std::multimap<_Key, _Tp, _Compare, _Alloc> fwd;
};
template <class _Key, class _Compare = std::less<_Key>, class _Alloc = std::allocator<_Key> > struct stdset
{
typedef std::set<_Key, _Compare, _Alloc> fwd;
};
//template <class _Key, class _HashFcn = std::hash<_Key>, class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator<_Key> > struct stdhash_set
//{
// typedef std::hash_set<_Key, _HashFcn, _Compare, _Alloc> fwd;
//};
template <class _Key, class _HashFcn = std::hash<_Key>, class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator<_Key> > struct stdunordered_set
{
typedef std::unordered_set<_Key, _HashFcn, _Compare, _Alloc> fwd;
};
template <class _Key, class _Compare = std::less<_Key>, class _Alloc = std::allocator<_Key> > struct stdmultiset
{
typedef std::multiset<_Key, _Compare, _Alloc> fwd;
};
template <class _Tp, class _Alloc = std::allocator<_Tp> > struct stdvector
{
typedef std::vector<_Tp, _Alloc> fwd;
};
template <class _Tp, class _Container = FORWARD_TYPENAME stdvector<_Tp>::fwd, class _Compare = std::less<typename _Container::value_type> > struct stdpriority_queue
{
typedef std::priority_queue<_Tp, _Container, _Compare> fwd;
};
template <class _Tp, class _Sequence = FORWARD_TYPENAME stddeque<_Tp>::fwd > struct stdqueue
{
typedef std::queue<_Tp, _Sequence> fwd;
};
template <class _Tp, class _Sequence = FORWARD_TYPENAME stddeque<_Tp>::fwd > struct stdstack
{
typedef std::stack<_Tp, _Sequence> fwd;
};
#include <vector>
#include <map>
#include <unordered_map>
#include <unordered_set>
#include <set>
#include <queue>
#include <list>
namespace Unicode
{
engine/shared/library/sharedFoundation/src/shared/Watcher.cpp
+2 -2
View File
@@ -18,8 +18,8 @@
namespace WatchedByListNamespace
{
typedef stdvector<BaseWatcher *>::fwd List;
typedef stdvector<List *>::fwd ListList;
typedef std::vector<BaseWatcher *> List;
typedef std::vector<List *> ListList;
ListList ms_listList;
engine/shared/library/sharedFoundation/src/shared/Watcher.h
+1 -1
View File
@@ -151,7 +151,7 @@ private:
private:
typedef stdvector<BaseWatcher *>::fwd List;
typedef std::vector<BaseWatcher *> List;
private:
engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.h
+32 -32
View File
@@ -62,59 +62,59 @@ class DynamicVariable
void setPosition(int newPosition);
explicit DynamicVariable(int value);
explicit DynamicVariable(const stdvector<int>::fwd & value);
explicit DynamicVariable(const std::vector<int> & value);
explicit DynamicVariable(float value);
explicit DynamicVariable(const stdvector<float>::fwd & value);
explicit DynamicVariable(const std::vector<float> & value);
explicit DynamicVariable(const Unicode::String &value);
explicit DynamicVariable(const std::string &value);
explicit DynamicVariable(const stdvector<Unicode::String>::fwd & value);
explicit DynamicVariable(const std::vector<Unicode::String> & value);
explicit DynamicVariable(const NetworkId & value);
explicit DynamicVariable(const stdvector<NetworkId>::fwd & value);
explicit DynamicVariable(const std::vector<NetworkId> & value);
explicit DynamicVariable(const DynamicVariableLocationData & value);
explicit DynamicVariable(const stdvector<DynamicVariableLocationData>::fwd & value);
explicit DynamicVariable(const std::vector<DynamicVariableLocationData> & value);
explicit DynamicVariable(const StringId &value);
explicit DynamicVariable(const stdvector<StringId>::fwd &value);
explicit DynamicVariable(const std::vector<StringId> &value);
explicit DynamicVariable(const Transform &value);
explicit DynamicVariable(const stdvector<Transform>::fwd &value);
explicit DynamicVariable(const std::vector<Transform> &value);
explicit DynamicVariable(const Vector &value);
explicit DynamicVariable(const stdvector<Vector>::fwd &value);
explicit DynamicVariable(const std::vector<Vector> &value);
bool get(int & value) const;
bool get(stdvector<int>::fwd & value) const;
bool get(std::vector<int> & value) const;
bool get(float & value) const;
bool get(stdvector<float>::fwd & value) const;
bool get(std::vector<float> & value) const;
bool get(Unicode::String & value) const;
bool get(std::string & value) const;
bool get(stdvector<Unicode::String>::fwd & value) const;
bool get(std::vector<Unicode::String> & value) const;
bool get(NetworkId & value) const;
bool get(stdvector<NetworkId>::fwd & value) const;
bool get(std::vector<NetworkId> & value) const;
bool get(DynamicVariableLocationData & value) const;
bool get(stdvector<DynamicVariableLocationData>::fwd & value) const;
bool get(std::vector<DynamicVariableLocationData> & value) const;
bool get(StringId &value) const;
bool get(stdvector<StringId>::fwd &value) const;
bool get(std::vector<StringId> &value) const;
bool get(Transform &value) const;
bool get(stdvector<Transform>::fwd &value) const;
bool get(std::vector<Transform> &value) const;
bool get(Vector &value) const;
bool get(stdvector<Vector>::fwd &value) const;
bool get(std::vector<Vector> &value) const;
int getUTF8Length() const;
static int getUTF8Length(const int & value);
static int getUTF8Length(const stdvector<int>::fwd & value);
static int getUTF8Length(const std::vector<int> & value);
static int getUTF8Length(const float & value);
static int getUTF8Length(const stdvector<float>::fwd & value);
static int getUTF8Length(const std::vector<float> & value);
static int getUTF8Length(const Unicode::String &value);
static int getUTF8Length(const std::string &value);
static int getUTF8Length(const stdvector<Unicode::String>::fwd & value);
static int getUTF8Length(const std::vector<Unicode::String> & value);
static int getUTF8Length(const NetworkId & value);
static int getUTF8Length(const stdvector<NetworkId>::fwd & value);
static int getUTF8Length(const std::vector<NetworkId> & value);
static int getUTF8Length(const DynamicVariableLocationData & value);
static int getUTF8Length(const stdvector<DynamicVariableLocationData>::fwd & value);
static int getUTF8Length(const std::vector<DynamicVariableLocationData> & value);
static int getUTF8Length(const StringId &value);
static int getUTF8Length(const stdvector<StringId>::fwd &value);
static int getUTF8Length(const std::vector<StringId> &value);
static int getUTF8Length(const Transform &value);
static int getUTF8Length(const stdvector<Transform>::fwd &value);
static int getUTF8Length(const std::vector<Transform> &value);
static int getUTF8Length(const Vector &value);
static int getUTF8Length(const stdvector<Vector>::fwd &value);
static int getUTF8Length(const std::vector<Vector> &value);
public:
// functions used for persistence:
@@ -125,22 +125,22 @@ public:
private:
static void pack(int value, Unicode::String & packedData);
static void pack(const stdvector<int>::fwd & value, Unicode::String & packedData);
static void pack(const std::vector<int> & value, Unicode::String & packedData);
static void pack(float value, Unicode::String & packedData);
static void pack(const stdvector<float>::fwd & value, Unicode::String & packedData);
static void pack(const std::vector<float> & value, Unicode::String & packedData);
static void pack(const Unicode::String &value, Unicode::String & packedData);
static void pack(const std::string &value, Unicode::String & packedData);
static void pack(const stdvector<Unicode::String>::fwd & value, Unicode::String & packedData);
static void pack(const std::vector<Unicode::String> & value, Unicode::String & packedData);
static void pack(const NetworkId & value, Unicode::String & packedData);
static void pack(const stdvector<NetworkId>::fwd & value, Unicode::String & packedData);
static void pack(const std::vector<NetworkId> & value, Unicode::String & packedData);
static void pack(const DynamicVariableLocationData & value, Unicode::String & packedData);
static void pack(const stdvector<DynamicVariableLocationData>::fwd & value, Unicode::String & packedData);
static void pack(const std::vector<DynamicVariableLocationData> & value, Unicode::String & packedData);
static void pack(const StringId &value, Unicode::String & packedData);
static void pack(const stdvector<StringId>::fwd &value, Unicode::String & packedData);
static void pack(const std::vector<StringId> &value, Unicode::String & packedData);
static void pack(const Transform &value, Unicode::String & packedData);
static void pack(const stdvector<Transform>::fwd &value, Unicode::String & packedData);
static void pack(const std::vector<Transform> &value, Unicode::String & packedData);
static void pack(const Vector &value, Unicode::String & packedData);
static void pack(const stdvector<Vector>::fwd &value, Unicode::String & packedData);
static void pack(const std::vector<Vector> &value, Unicode::String & packedData);
private:
DynamicVariableType m_type;
engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.cpp
+16 -16
View File
@@ -221,22 +221,22 @@ bool DynamicVariableList::getItem(const std::string &name, T &value) const \
}
GET_ITEM(int)
GET_ITEM(stdvector<int>::fwd)
GET_ITEM(std::vector<int>)
GET_ITEM(float)
GET_ITEM(stdvector<float>::fwd)
GET_ITEM(std::vector<float>)
GET_ITEM(Unicode::String)
GET_ITEM(std::string)
GET_ITEM(stdvector<Unicode::String>::fwd)
GET_ITEM(std::vector<Unicode::String>)
GET_ITEM(NetworkId)
GET_ITEM(stdvector<NetworkId>::fwd)
GET_ITEM(std::vector<NetworkId>)
GET_ITEM(DynamicVariableLocationData)
GET_ITEM(stdvector<DynamicVariableLocationData>::fwd)
GET_ITEM(std::vector<DynamicVariableLocationData>)
GET_ITEM(StringId)
GET_ITEM(stdvector<StringId>::fwd)
GET_ITEM(std::vector<StringId>)
GET_ITEM(Transform)
GET_ITEM(stdvector<Transform>::fwd)
GET_ITEM(std::vector<Transform>)
GET_ITEM(Vector)
GET_ITEM(stdvector<Vector>::fwd)
GET_ITEM(std::vector<Vector>)
// ======================================================================
// DynamicVariableList setters
@@ -250,22 +250,22 @@ bool DynamicVariableList::setItem(const std::string &name, const T &value) \
}
SET_ITEM(int)
SET_ITEM(stdvector<int>::fwd)
SET_ITEM(std::vector<int>)
SET_ITEM(float)
SET_ITEM(stdvector<float>::fwd)
SET_ITEM(std::vector<float>)
SET_ITEM(Unicode::String)
SET_ITEM(std::string)
SET_ITEM(stdvector<Unicode::String>::fwd)
SET_ITEM(std::vector<Unicode::String>)
SET_ITEM(NetworkId)
SET_ITEM(stdvector<NetworkId>::fwd)
SET_ITEM(std::vector<NetworkId>)
SET_ITEM(DynamicVariableLocationData)
SET_ITEM(stdvector<DynamicVariableLocationData>::fwd)
SET_ITEM(std::vector<DynamicVariableLocationData>)
SET_ITEM(StringId)
SET_ITEM(stdvector<StringId>::fwd)
SET_ITEM(std::vector<StringId>)
SET_ITEM(Transform)
SET_ITEM(stdvector<Transform>::fwd)
SET_ITEM(std::vector<Transform>)
SET_ITEM(Vector)
SET_ITEM(stdvector<Vector>::fwd)
SET_ITEM(std::vector<Vector>)
bool DynamicVariableList::setItem(const std::string &name, DynamicVariable value)
{
engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.h
+16 -16
View File
@@ -52,40 +52,40 @@ public:
size_t size() const;
bool getItem(const std::string &name,int & value) const;
bool getItem(const std::string &name,stdvector<int>::fwd & value) const;
bool getItem(const std::string &name,std::vector<int> & value) const;
bool getItem(const std::string &name,float & value) const;
bool getItem(const std::string &name,stdvector<float>::fwd & value) const;
bool getItem(const std::string &name,std::vector<float> & value) const;
bool getItem(const std::string &name,Unicode::String & value) const;
bool getItem(const std::string &name,std::string & value) const;
bool getItem(const std::string &name,stdvector<Unicode::String>::fwd & value) const;
bool getItem(const std::string &name,std::vector<Unicode::String> & value) const;
bool getItem(const std::string &name,NetworkId & value) const;
bool getItem(const std::string &name,stdvector<NetworkId>::fwd & value) const;
bool getItem(const std::string &name,std::vector<NetworkId> & value) const;
bool getItem(const std::string &name,DynamicVariableLocationData & value) const;
bool getItem(const std::string &name,stdvector<DynamicVariableLocationData>::fwd & value) const;
bool getItem(const std::string &name,std::vector<DynamicVariableLocationData> & value) const;
bool getItem(const std::string &name,StringId &value) const;
bool getItem(const std::string &name,stdvector<StringId>::fwd &value) const;
bool getItem(const std::string &name,std::vector<StringId> &value) const;
bool getItem(const std::string &name,Transform &value) const;
bool getItem(const std::string &name,stdvector<Transform>::fwd &value) const;
bool getItem(const std::string &name,std::vector<Transform> &value) const;
bool getItem(const std::string &name,Vector &value) const;
bool getItem(const std::string &name,stdvector<Vector>::fwd &value) const;
bool getItem(const std::string &name,std::vector<Vector> &value) const;
bool setItem(const std::string &name, const int & value);
bool setItem(const std::string &name, const stdvector<int>::fwd & value);
bool setItem(const std::string &name, const std::vector<int> & value);
bool setItem(const std::string &name, const float & value);
bool setItem(const std::string &name, const stdvector<float>::fwd & value);
bool setItem(const std::string &name, const std::vector<float> & value);
bool setItem(const std::string &name, const Unicode::String & value);
bool setItem(const std::string &name, const std::string & value);
bool setItem(const std::string &name, const stdvector<Unicode::String>::fwd & value);
bool setItem(const std::string &name, const std::vector<Unicode::String> & value);
bool setItem(const std::string &name, const NetworkId & value);
bool setItem(const std::string &name, const stdvector<NetworkId>::fwd & value);
bool setItem(const std::string &name, const std::vector<NetworkId> & value);
bool setItem(const std::string &name, const DynamicVariableLocationData & value);
bool setItem(const std::string &name, const stdvector<DynamicVariableLocationData>::fwd & value);
bool setItem(const std::string &name, const std::vector<DynamicVariableLocationData> & value);
bool setItem(const std::string &name, const StringId &value);
bool setItem(const std::string &name, const stdvector<StringId>::fwd &value);
bool setItem(const std::string &name, const std::vector<StringId> &value);
bool setItem(const std::string &name, const Transform &value);
bool setItem(const std::string &name, const stdvector<Transform>::fwd &value);
bool setItem(const std::string &name, const std::vector<Transform> &value);
bool setItem(const std::string &name, const Vector &value);
bool setItem(const std::string &name, const stdvector<Vector>::fwd &value);
bool setItem(const std::string &name, const std::vector<Vector> &value);
bool setItem(const std::string &name, DynamicVariable value);
int getRevision() const;
engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.cpp
+16 -16
View File
@@ -183,22 +183,22 @@ bool DynamicVariableListNestedList::getItem(const std::string &name, T &value) c
}
NESTED_LIST_GET_ITEM(int)
NESTED_LIST_GET_ITEM(stdvector<int>::fwd)
NESTED_LIST_GET_ITEM(std::vector<int>)
NESTED_LIST_GET_ITEM(float)
NESTED_LIST_GET_ITEM(stdvector<float>::fwd)
NESTED_LIST_GET_ITEM(std::vector<float>)
NESTED_LIST_GET_ITEM(Unicode::String)
NESTED_LIST_GET_ITEM(std::string)
NESTED_LIST_GET_ITEM(stdvector<Unicode::String>::fwd)
NESTED_LIST_GET_ITEM(std::vector<Unicode::String>)
NESTED_LIST_GET_ITEM(NetworkId)
NESTED_LIST_GET_ITEM(stdvector<NetworkId>::fwd)
NESTED_LIST_GET_ITEM(std::vector<NetworkId>)
NESTED_LIST_GET_ITEM(DynamicVariableLocationData)
NESTED_LIST_GET_ITEM(stdvector<DynamicVariableLocationData>::fwd)
NESTED_LIST_GET_ITEM(std::vector<DynamicVariableLocationData>)
NESTED_LIST_GET_ITEM(StringId)
NESTED_LIST_GET_ITEM(stdvector<StringId>::fwd)
NESTED_LIST_GET_ITEM(std::vector<StringId>)
NESTED_LIST_GET_ITEM(Transform)
NESTED_LIST_GET_ITEM(stdvector<Transform>::fwd)
NESTED_LIST_GET_ITEM(std::vector<Transform>)
NESTED_LIST_GET_ITEM(Vector)
NESTED_LIST_GET_ITEM(stdvector<Vector>::fwd)
NESTED_LIST_GET_ITEM(std::vector<Vector>)
// ======================================================================
// DynamicVariableListNestedList::const_iterator
@@ -308,20 +308,20 @@ bool DynamicVariableListNestedList::const_iterator::getValue(T &value) const \
}
NESTED_LIST_CONST_ITERATOR_GET_VALUE(int)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<int>::fwd)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<int>)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(float)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<float>::fwd)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<float>)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(Unicode::String)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::string)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<Unicode::String>::fwd)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<Unicode::String>)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(NetworkId)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<NetworkId>::fwd)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<NetworkId>)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(DynamicVariableLocationData)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<DynamicVariableLocationData>::fwd)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<DynamicVariableLocationData>)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(StringId)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<StringId>::fwd)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<StringId>)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(Transform)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<Transform>::fwd)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<Transform>)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(Vector)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<Vector>::fwd)
NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<Vector>)
//======================================================================
engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.h
+16 -16
View File
@@ -58,22 +58,22 @@ public:
bool operator!= (const const_iterator &rhs) const;
bool getValue (int & value) const;
bool getValue (stdvector<int>::fwd & value) const;
bool getValue (std::vector<int> & value) const;
bool getValue (float & value) const;
bool getValue (stdvector<float>::fwd & value) const;
bool getValue (std::vector<float> & value) const;
bool getValue (Unicode::String & value) const;
bool getValue (std::string & value) const;
bool getValue (stdvector<Unicode::String>::fwd & value) const;
bool getValue (std::vector<Unicode::String> & value) const;
bool getValue (NetworkId & value) const;
bool getValue (stdvector<NetworkId>::fwd & value) const;
bool getValue (std::vector<NetworkId> & value) const;
bool getValue (DynamicVariableLocationData & value) const;
bool getValue (stdvector<DynamicVariableLocationData>::fwd & value) const;
bool getValue (std::vector<DynamicVariableLocationData> & value) const;
bool getValue (StringId &value) const;
bool getValue (stdvector<StringId>::fwd &value) const;
bool getValue (std::vector<StringId> &value) const;
bool getValue (Transform &value) const;
bool getValue (stdvector<Transform>::fwd &value) const;
bool getValue (std::vector<Transform> &value) const;
bool getValue (Vector &value) const;
bool getValue (stdvector<Vector>::fwd &value) const;
bool getValue (std::vector<Vector> &value) const;
private:
const DynamicVariableListNestedList & m_context;
@@ -103,22 +103,22 @@ public:
const_iterator getItemByPosition (int position) const;
bool getItem (const std::string &name,int & value) const;
bool getItem (const std::string &name,stdvector<int>::fwd & value) const;
bool getItem (const std::string &name,std::vector<int> & value) const;
bool getItem (const std::string &name,float & value) const;
bool getItem (const std::string &name,stdvector<float>::fwd & value) const;
bool getItem (const std::string &name,std::vector<float> & value) const;
bool getItem (const std::string &name,Unicode::String & value) const;
bool getItem (const std::string &name,std::string & value) const;
bool getItem (const std::string &name,stdvector<Unicode::String>::fwd & value) const;
bool getItem (const std::string &name,std::vector<Unicode::String> & value) const;
bool getItem (const std::string &name,NetworkId & value) const;
bool getItem (const std::string &name,stdvector<NetworkId>::fwd & value) const;
bool getItem (const std::string &name,std::vector<NetworkId> & value) const;
bool getItem (const std::string &name,DynamicVariableLocationData & value) const;
bool getItem (const std::string &name,stdvector<DynamicVariableLocationData>::fwd & value) const;
bool getItem (const std::string &name,std::vector<DynamicVariableLocationData> & value) const;
bool getItem (const std::string &name,StringId &value) const;
bool getItem (const std::string &name,stdvector<StringId>::fwd &value) const;
bool getItem (const std::string &name,std::vector<StringId> &value) const;
bool getItem (const std::string &name,Transform &value) const;
bool getItem (const std::string &name,stdvector<Transform>::fwd &value) const;
bool getItem (const std::string &name,std::vector<Transform> &value) const;
bool getItem (const std::string &name,Vector &value) const;
bool getItem (const std::string &name,stdvector<Vector>::fwd &value) const;
bool getItem (const std::string &name,std::vector<Vector> &value) const;
private:
const DynamicVariableList & m_list;
engine/shared/library/sharedFoundation/src/win32/Os.h
+1 -1
View File
@@ -27,7 +27,7 @@ public:
typedef void (*QueueCharacterHookFunction)(int keyboard, int character);
typedef void (*SetSystemMouseCursorPositionHookFunction)(int x, int y);
typedef bool (*GetHardwareMouseCursorEnabled)();
typedef void (*GetOtherAdapterRectsHookFunction)(stdvector<RECT>::fwd &);
typedef void (*GetOtherAdapterRectsHookFunction)(std::vector<RECT> &);
typedef void (*WindowPositionChangedHookFunction)();
typedef void (*DisplayModeChangedHookFunction)();
typedef void (*InputLanguageChangedHookFunction)();