TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-09 15:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess

Browse source 
# Conflicts:
#	Engine/source/sfx/sfxSystem.cpp
This commit is contained in:
Azaezel 2018-04-23 10:08:14 -05:00
commit 13334b4d5c
22 changed files with 72 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/console/engineFunctions.h
View file

@ -108,7 +108,7 @@ private:
std::tie(std::get<I + (sizeof...(ArgTs) - sizeof...(TailTs))>(args)...) = defaultArgs;
}
#if _MSC_VER >= 1910
#if defined(_MSC_VER) && (_MSC_VER >= 1910)
template<typename ...TailTs>
struct DodgyVCHelper
{

10
Engine/source/console/simObjectList.cpp
View file

@ -33,7 +33,7 @@ String SimObjectList::smSortScriptCallbackFn;
bool SimObjectList::pushBack(SimObject* obj)
{
if (find(begin(),end(),obj) == end())
if (T3D::find(begin(),end(),obj) == end())
{
push_back(obj);
return true;
@ -44,7 +44,7 @@ bool SimObjectList::pushBack(SimObject* obj)
bool SimObjectList::pushBackForce(SimObject* obj)
{
iterator itr = find(begin(),end(),obj);
iterator itr = T3D::find(begin(),end(),obj);
if (itr == end())
{
push_back(obj);
@ -64,7 +64,7 @@ bool SimObjectList::pushBackForce(SimObject* obj)
bool SimObjectList::pushFront(SimObject* obj)
{
if (find(begin(),end(),obj) == end())
if (T3D::find(begin(),end(),obj) == end())
{
push_front(obj);
return true;
@ -75,7 +75,7 @@ bool SimObjectList::pushFront(SimObject* obj)
bool SimObjectList::remove(SimObject* obj)
{
iterator ptr = find(begin(),end(),obj);
iterator ptr = T3D::find(begin(),end(),obj);
if (ptr != end())
{
erase(ptr);
@ -87,7 +87,7 @@ bool SimObjectList::remove(SimObject* obj)
bool SimObjectList::removeStable(SimObject* obj)
{
iterator ptr = find(begin(),end(),obj);
iterator ptr = T3D::find(begin(),end(),obj);
if (ptr != end())
{
erase(ptr);

4
Engine/source/console/simSet.h
View file

@ -154,9 +154,9 @@ class SimSet : public SimObject, public TamlChildren
value operator[] (S32 index) { return mObjectList[U32(index)]; }
inline iterator find( iterator first, iterator last, SimObject *obj)
{ return ::find(first, last, obj); }
{ return T3D::find(first, last, obj); }
inline iterator find(SimObject *obj)
{ return ::find(begin(), end(), obj); }
{ return T3D::find(begin(), end(), obj); }
/// Reorder the position of "obj" to either be the last object in the list or, if
/// "target" is given, to come before "target" in the list of children.