AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed dllexport/import attribute from private class, disable related warning C4251

This commit is contained in:
PKEuS 2013-07-26 10:42:44 +02:00
parent 0c55c70b11
commit 95060350bd
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tinyxml2.h
View File

@ -57,6 +57,10 @@ distribution.
# endif # endif
#endif #endif
#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable: 4251)
#endif
#ifdef _WIN32 #ifdef _WIN32
# ifdef TINYXML2_EXPORT # ifdef TINYXML2_EXPORT
@ -134,7 +138,7 @@ class XMLPrinter;
and entity translation if actually read. Can also store (and memory and entity translation if actually read. Can also store (and memory
manage) a traditional char[] manage) a traditional char[]
*/ */
class TINYXML2_LIB StrPair class StrPair
{ {
public: public:
enum { enum {
@ -198,7 +202,7 @@ private:
cause a call to new/delete cause a call to new/delete
*/ */
template <class T, int INIT> template <class T, int INIT>
class TINYXML2_LIB DynArray class DynArray
{ {
public: public:
DynArray< T, INIT >() { DynArray< T, INIT >() {
@ -289,7 +293,7 @@ private:
Parent virtual class of a pool for fast allocation Parent virtual class of a pool for fast allocation
and deallocation of objects. and deallocation of objects.
*/ */
class TINYXML2_LIB MemPool class MemPool
{ {
public: public:
MemPool() {} MemPool() {}
@ -306,7 +310,7 @@ public:
Template child class to create pools of the correct type. Template child class to create pools of the correct type.
*/ */
template< int SIZE > template< int SIZE >
class TINYXML2_LIB MemPoolT : public MemPool class MemPoolT : public MemPool
{ {
public: public:
MemPoolT() : _root(0), _currentAllocs(0), _nAllocs(0), _maxAllocs(0), _nUntracked(0) {} MemPoolT() : _root(0), _currentAllocs(0), _nAllocs(0), _maxAllocs(0), _nUntracked(0) {}
@ -1977,5 +1981,8 @@ private:
} // tinyxml2 } // tinyxml2
#if defined(_MSC_VER)
# pragma warning(pop)
#endif
#endif // TINYXML2_INCLUDED #endif // TINYXML2_INCLUDED