Browse Source

Fix some pnUtils header issues.

Darryl Pogue 13 years ago
parent
commit
454e4c8afb
  1. 1
      Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h
  2. 5
      Sources/Plasma/NucleusLib/pnUtils/pnUtCoreLib.h
  3. 5
      Sources/Plasma/NucleusLib/pnUtils/pnUtPragma.h
  4. 2
      Sources/Plasma/NucleusLib/pnUtils/pnUtils.h

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

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

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

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

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

@ -45,11 +45,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
#ifdef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTPRAGMA_H
#error "Header $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPragma.h included more than once"
#endif
#ifndef 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: 4201) // nonstandard extension used : nameless struct/union
#endif

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

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

Loading…
Cancel
Save