TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 00:54:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1473 from Tribes2-SCP/tinyXMLFix

Browse source 
Fix TinyXML Build errors
This commit is contained in:
Areloch 2015-12-21 01:10:15 -06:00
commit 24dc8e6990
1 changed files with 53 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/console/consoleObject.h
View file

@ -48,7 +48,7 @@
#include "console/simObjectRef.h" #include "console/simObjectRef.h"
#endif #endif
#ifndef TINYXML_INCLUDED #ifndef TINYXML_INCLUDED
#include "tinyXML/tinyxml.h" #include "tinyxml.h"
#endif #endif
/// @file /// @file
@ -434,10 +434,6 @@ public:
/// This is a function pointer typedef to support optional writing for fields. /// This is a function pointer typedef to support optional writing for fields.
typedef bool(*WriteDataNotify)(void* obj, StringTableEntry pFieldName); typedef bool(*WriteDataNotify)(void* obj, StringTableEntry pFieldName);
/// Allows the writing of a custom TAML schema.
typedef void(*WriteCustomTamlSchema)(const AbstractClassRep* pClassRep, TiXmlElement* pParentElement);
/// These are special field type values used to mark /// These are special field type values used to mark
/// groups and arrays in the field list. /// groups and arrays in the field list.
/// @see Field::type /// @see Field::type