OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Fix some pnUtils header issues.

Browse Source
This commit is contained in:
Darryl Pogue
2012-01-28 22:32:30 -08:00
parent 7fe124c1e0
commit 454e4c8afb
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h
View File

@ -70,7 +70,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnUtMisc.h" #include "pnUtMisc.h"
#include "pnUtCrypt.h" #include "pnUtCrypt.h"
#include "pnUtSpareList.h" #include "pnUtSpareList.h"
#include "pnUtSubst.h"
#include "pnUtRand.h" #include "pnUtRand.h"
#include "pnUtBase64.h" #include "pnUtBase64.h"
#include "pnUtSkipList.h" #include "pnUtSkipList.h"

5
Sources/Plasma/NucleusLib/pnUtils/pnUtCoreLib.h
View File

@ -45,9 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
* *
***/ ***/
#ifdef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTCORELIB_H #ifndef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTCORELIB_H
#error "Header $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCoreLib.h included more than once"
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTCORELIB_H #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTCORELIB_H
#pragma warning(push, 0) #pragma warning(push, 0)
@ -58,3 +56,4 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsStream.h" #include "hsStream.h"
#pragma warning(pop) #pragma warning(pop)
#endif

5
Sources/Plasma/NucleusLib/pnUtils/pnUtPragma.h
View File

@ -45,11 +45,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
* *
***/ ***/
#ifdef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTPRAGMA_H #ifndef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTPRAGMA_H
#error "Header $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPragma.h included more than once"
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTPRAGMA_H #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTPRAGMA_H
#pragma warning(disable: 4800) // 'type' : forcing value to bool 'true' or 'false' (performance warning) #pragma warning(disable: 4800) // 'type' : forcing value to bool 'true' or 'false' (performance warning)
#pragma warning(disable: 4201) // nonstandard extension used : nameless struct/union #pragma warning(disable: 4201) // nonstandard extension used : nameless struct/union
#endif

2
Sources/Plasma/NucleusLib/pnUtils/pnUtils.h
View File

@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PNUTILS_H #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PNUTILS_H
#include "Private/pnUtAllIncludes.h" #include "pnUtAllIncludes.h"
#endif // PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PNUTILS_H #endif // PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PNUTILS_H