diff --git a/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt
index 6820ede5..e2655a48 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt
+++ b/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt
@@ -2,88 +2,81 @@ include_directories("../../CoreLib")
include_directories("../../NucleusLib")
set(pnUtils_HEADERS
- Intern.h
Pch.h
pnUtils.h
-)
-
-set(pnUtils_PRIVATE
- Private/pnUtAddr.h
- Private/pnUtAddr.cpp
- Private/pnUtAllIncludes.h
- Private/pnUtArray.h
- Private/pnUtArray.cpp
- Private/pnUtBase64.h
- Private/pnUtBase64.cpp
- Private/pnUtBigNum.h
- Private/pnUtBigNum.cpp
- Private/pnUtCmd.h
- Private/pnUtCmd.cpp
- Private/pnUtCoreLib.h
- Private/pnUtCrypt.h
- Private/pnUtCrypt.cpp
- Private/pnUtHash.h
- Private/pnUtHash.cpp
- Private/pnUtList.h
- Private/pnUtList.cpp
- Private/pnUtMath.h
- Private/pnUtMath.cpp
- Private/pnUtMisc.h
- Private/pnUtMisc.cpp
- Private/pnUtPath.h
- Private/pnUtPath.cpp
- Private/pnUtPragma.h
- Private/pnUtPriQ.h
- Private/pnUtRand.h
- Private/pnUtRand.cpp
- Private/pnUtRef.h
- Private/pnUtSkipList.h
- Private/pnUtSort.h
- Private/pnUtSpareList.h
- Private/pnUtSpareList.cpp
- Private/pnUtStr.h
- Private/pnUtStr.cpp
- Private/pnUtSubst.h
- Private/pnUtSubst.cpp
- Private/pnUtSync.h
- Private/pnUtTime.h
- Private/pnUtTime.cpp
- Private/pnUtTls.h
- Private/pnUtTls.cpp
- Private/pnUtUuid.h
- Private/pnUtUuid.cpp
+ pnUtCoreLib.h
+ pnUtAddr.h
+ pnUtAllIncludes.h
+ pnUtArray.h
+ pnUtBase64.h
+ pnUtBigNum.h
+ pnUtCmd.h
+ pnUtCrypt.h
+ pnUtHash.h
+ pnUtList.h
+ pnUtMath.h
+ pnUtMisc.h
+ pnUtPath.h
+ pnUtPragma.h
+ pnUtPriQ.h
+ pnUtRand.h
+ pnUtRef.h
+ pnUtSkipList.h
+ pnUtSort.h
+ pnUtSpareList.h
+ pnUtStr.h
+ pnUtSync.h
+ pnUtTime.h
+ pnUtTls.h
+ pnUtUuid.h
)
set(pnUtils_SOURCES
- pnUtils.cpp
+ pnUtAddr.cpp
+ pnUtArray.cpp
+ pnUtBase64.cpp
+ pnUtBigNum.cpp
+ pnUtCmd.cpp
+ pnUtHash.cpp
+ pnUtList.cpp
+ pnUtMath.cpp
+ pnUtMisc.cpp
+ pnUtPath.cpp
+ pnUtRand.cpp
+ pnUtSpareList.cpp
+ pnUtStr.cpp
+ pnUtTime.cpp
)
if(WIN32)
set(pnUtils_WIN32
- Private/Win32/pnUtW32Addr.cpp
- Private/Win32/pnUtW32Misc.cpp
- Private/Win32/pnUtW32Path.cpp
- Private/Win32/pnUtW32Str.cpp
- Private/Win32/pnUtW32Sync.cpp
- Private/Win32/pnUtW32Time.cpp
- Private/Win32/pnUtW32Uuid.cpp
+ Win32/pnUtW32Addr.cpp
+ Win32/pnUtW32Misc.cpp
+ Win32/pnUtW32Path.cpp
+ Win32/pnUtW32Str.cpp
+ Win32/pnUtW32Sync.cpp
+ Win32/pnUtW32Time.cpp
+ Win32/pnUtW32Uuid.cpp
+
+ pnUtCrypt.cpp
+ pnUtTls.cpp
+ pnUtUuid.cpp
)
else()
set(pnUtils_UNIX
- Private/Unix/pnUtUxStr.cpp
- Private/Unix/pnUtUxSync.cpp
- Private/Unix/pnUtUxUuid.cpp
+ Unix/pnUtUxStr.cpp
+ #Unix/pnUtUxSync.cpp
+ #Unix/pnUtUxUuid.cpp
)
endif()
-add_library(pnUtils STATIC ${pnUtils_HEADERS} ${pnUtils_PRIVATE} ${pnUtils_SOURCES}
+add_library(pnUtils STATIC ${pnUtils_HEADERS} ${pnUtils_SOURCES}
${pnUtils_UNIX} ${pnUtils_WIN32})
source_group("Header Files" FILES ${pnUtils_HEADERS})
source_group("Source Files" FILES ${pnUtils_SOURCES})
-source_group("Private" FILES ${pnUtils_PRIVATE})
if(WIN32)
- source_group("Private\\Win32" FILES ${pnUtils_WIN32})
+ source_group("Win32" FILES ${pnUtils_WIN32})
else()
- source_group("Private\\Unix" FILES ${pnUtils_UNIX})
+ source_group("Unix" FILES ${pnUtils_UNIX})
endif()
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Intern.h b/Sources/Plasma/NucleusLib/pnUtils/Intern.h
deleted file mode 100644
index 5c93109e..00000000
--- a/Sources/Plasma/NucleusLib/pnUtils/Intern.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-/*****************************************************************************
-*
-* $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Intern.h
-*
-***/
-
-#ifdef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_INTERN_H
-#error "Header $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Intern.h included more than once"
-#endif
-#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_INTERN_H
-
-
-
-/*****************************************************************************
-*
-* Crypt
-*
-***/
-
-namespace Crypt {
-
-//============================================================================
-class KeyBase {
-public:
- virtual void Codec (bool encrypt, ARRAY(uint8_t) * dest, unsigned sourceBytes, const void * sourceData) = 0;
- virtual unsigned GetBlockSize () const = 0;
-};
-
-} // namespace Crypt
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Pch.h b/Sources/Plasma/NucleusLib/pnUtils/Pch.h
index b956e38c..ac9bcdc7 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Pch.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/Pch.h
@@ -45,14 +45,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#ifdef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PCH_H
-#error "Header $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Pch.h included more than once"
-#endif
+#ifndef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PCH_H
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PCH_H
-#include "Private/pnUtAllIncludes.h"
-#include "Intern.h"
-
+#include "pnUtCoreLib.h" // must be first in list
+#include "pnUtPragma.h"
#include "pnProduct/pnProduct.h"
#include
@@ -66,4 +63,4 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#pragma warning(pop)
#endif
-#include // _alloca
+#endif
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSubst.cpp b/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSubst.cpp
deleted file mode 100644
index 9a671032..00000000
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSubst.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-/*****************************************************************************
-*
-* $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSubst.cpp
-*
-***/
-
-#include "../Pch.h"
-#pragma hdrstop
-
-#define SUBST_BLOCK SubstParsedData::SubstBlock
-
-/*****************************************************************************
-*
-* Internal functions
-*
-***/
-
-//============================================================================
-template
-bool IVarSubstitute (
- ARRAY(chartype) * dst,
- const chartype src[],
- unsigned varCount,
- const chartype * varNames[], // [varCount]
- const chartype * varValues[] // [varCount]
-) {
- ASSERT(dst);
- ASSERT(src);
- ASSERT(varNames);
- ASSERT(varValues);
-
- dst->Reserve(StrLen(src) * 5/4);
-
- bool result = true;
- while (*src) {
- // Copy non-substituted strings and escape %% symbols
- if ((*src != L'%') || (*++src == L'%')) {
- dst->Push(*src++);
- continue;
- }
-
- // Find variable definition
- const chartype * varStart = src;
- const chartype * varEnd = StrChr(varStart, L'%');
- if (!varEnd) {
- // Skip % character and continue
- result = false;
- continue;
- }
-
- // Validate variable name length
- chartype varBuffer[256];
- if (varEnd - varStart >= arrsize(varBuffer)) {
- result = false;
- src = varEnd + 1;
- continue;
- }
-
- // Copy variable name excluding trailing '%'
- StrCopy(varBuffer, varStart, varEnd - varStart + 1);
- src = varEnd + 1;
-
- // Find the variable value and perform substitution
- bool found = false;
- for (unsigned i = 0; i < varCount; ++i) {
- if (StrCmp(varBuffer, varNames[i]))
- continue;
- dst->Add(varValues[i], StrLen(varValues[i]));
- found = true;
- break;
- }
-
- // Check that variable definition exists
- result = result && found;
- }
-
- // Terminate string
- dst->Push(0);
- return result;
-}
-
-//============================================================================
-template
-bool IParseForSubst (
- SubstParsedData * dest,
- const chartype src[]
-) {
- const chartype * current = src;
- bool result = true;
- while (*current) {
- // Copy non-substituted strings and escape %% symbols
- if ((*current != L'%') || (*++current == L'%')) {
- current++;
- continue;
- }
-
- // Find variable definition
- const chartype * varStart = current;
- const chartype * varEnd = StrChr(varStart, L'%');
- if (!varEnd) {
- // Skip % character and continue
- result = false;
- continue;
- }
-
- // We've found a variable, copy the current data to a new object
- if (current != src) {
- int strLen = (current - src) - 1;
- SUBST_BLOCK * block = new SUBST_BLOCK;
- block->isVar = false;
- block->strLen = strLen;
- block->data = (chartype*)calloc((strLen + 1), sizeof(chartype));
- memcpy(block->data, src, strLen * sizeof(chartype));
-
- dest->blocks.Add(block);
- }
-
- // Validate variable name length
- chartype varBuffer[256];
- if (varEnd - varStart >= arrsize(varBuffer)) {
- result = false;
- src = current = varEnd + 1;
- continue;
- }
-
- // Copy variable name excluding trailing '%'
- int strLen = (varEnd - varStart);
- SUBST_BLOCK * block = new SUBST_BLOCK;
- block->isVar = true;
- block->strLen = strLen;
- block->data = (chartype*)calloc((strLen + 1), sizeof(chartype));
- memcpy(block->data, varStart, strLen * sizeof(chartype));
-
- dest->blocks.Add(block);
-
- src = current = varEnd + 1;
- }
-
- // Check and see if there's any data remaining
- if (current != src) {
- int strLen = (current - src);
- SUBST_BLOCK * block = new SUBST_BLOCK;
- block->isVar = false;
- block->strLen = strLen;
- block->data = (chartype*)calloc((strLen + 1), sizeof(chartype));
- memcpy(block->data, src, strLen * sizeof(chartype));
-
- dest->blocks.Add(block);
- }
-
- return result;
-}
-
-//============================================================================
-template
-bool IVarSubstPreParsed (
- ARRAY(chartype) * dst,
- const SubstParsedData * src,
- unsigned varCount,
- const chartype * varNames[], // [varCount]
- const chartype * varValues[] // [varCount]
-) {
- unsigned approxTotalSize = 0;
- for (unsigned i = 0; i < src->blocks.Count(); ++i) {
- approxTotalSize += src->blocks[i]->strLen;
- }
-
- dst->Reserve(approxTotalSize * 5/4);
-
- bool foundAll = true;
- for (unsigned blockIndex = 0; blockIndex < src->blocks.Count(); ++blockIndex) {
- SUBST_BLOCK * block = src->blocks[blockIndex];
- if (block->isVar) {
- bool found = false;
- for (unsigned varIndex = 0; varIndex < varCount; ++varIndex) {
- if (StrCmp(block->data, varNames[varIndex])) {
- continue;
- }
-
- dst->Add(varValues[varIndex], StrLen(varValues[varIndex]));
- found = true;
- break;
- }
-
- foundAll &= found;
- }
- else {
- dst->Add(block->data, block->strLen);
- }
- }
- dst->Push(0);
-
- return foundAll;
-}
-
-
-/*****************************************************************************
-*
-* Exports
-*
-***/
-
-//============================================================================
-bool ParseForSubst (
- SubstParsedData * dest,
- const wchar_t src[]
-) {
- return IParseForSubst(dest, src);
-}
-
-//============================================================================
-bool ParseForSubst (
- SubstParsedData * dest,
- const char src[]
-) {
- return IParseForSubst(dest, src);
-}
-
-//============================================================================
-bool VarSubstitute (
- ARRAY(wchar_t) * dst,
- const wchar_t src[],
- unsigned varCount,
- const wchar_t * varNames[], // [varCount]
- const wchar_t * varValues[] // [varCount]
-) {
- return IVarSubstitute(dst, src, varCount, varNames, varValues);
-}
-
-//============================================================================
-bool VarSubstitute (
- ARRAY(char) * dst,
- const char src[],
- unsigned varCount,
- const char * varNames[], // [varCount]
- const char * varValues[] // [varCount]
-) {
- return IVarSubstitute(dst, src, varCount, varNames, varValues);
-}
-
-//============================================================================
-bool VarSubstitute (
- ARRAY(wchar_t) * dst,
- const SubstParsedData * src,
- unsigned varCount,
- const wchar_t * varNames[], // [varCount]
- const wchar_t * varValues[] // [varCount]
-) {
- return IVarSubstPreParsed(dst, src, varCount, varNames, varValues);
-}
-
-//============================================================================
-bool VarSubstitute (
- ARRAY(char) * dst,
- const SubstParsedData * src,
- unsigned varCount,
- const char * varNames[], // [varCount]
- const char * varValues[] // [varCount]
-) {
- return IVarSubstPreParsed(dst, src, varCount, varNames, varValues);
-}
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSubst.h b/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSubst.h
deleted file mode 100644
index 0490e76c..00000000
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSubst.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-/*****************************************************************************
-*
-* $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSubst.h
-*
-***/
-
-#ifdef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTSUBST_H
-#error "Header $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSubst.h included more than once"
-#endif
-#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTSUBST_H
-
-template
-struct SubstParsedData {
- template
- struct SubstBlock {
- bool isVar;
- char_type * data;
- unsigned strLen;
-
- SubstBlock()
- : isVar(false)
- , data(nil)
- {
- }
-
- ~SubstBlock() {
- free(data);
- }
- };
-
- ARRAY(SubstBlock*) blocks;
-
- ~SubstParsedData() {
- for (unsigned i = 0; i < blocks.Count(); ++i) {
- SubstBlock * block = blocks[i];
- delete block;
- }
- }
-};
-
-bool ParseForSubst (
- SubstParsedData * dest,
- const wchar_t src[]
-);
-bool ParseForSubst (
- SubstParsedData * dest,
- const char src[]
-);
-
-// Return value is for validation purposes only; it may be ignored
-bool VarSubstitute (
- ARRAY(wchar_t) * dst,
- const wchar_t src[],
- unsigned varCount,
- const wchar_t * varNames[], // [varCount]
- const wchar_t * varValues[] // [varCount]
-);
-bool VarSubstitute (
- ARRAY(char) * dst,
- const char src[],
- unsigned varCount,
- const char * varNames[], // [varCount]
- const char * varValues[] // [varCount]
-);
-bool VarSubstitute (
- ARRAY(wchar_t) * dst,
- const SubstParsedData * src,
- unsigned varCount,
- const wchar_t * varNames[], // [varCount]
- const wchar_t * varValues[] // [varCount]
-);
-bool VarSubstitute (
- ARRAY(char) * dst,
- const SubstParsedData * src,
- unsigned varCount,
- const char * varNames[], // [varCount]
- const char * varValues[] // [varCount]
-);
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxStr.cpp b/Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxStr.cpp
similarity index 98%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxStr.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxStr.cpp
index 768543e3..c375c701 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxStr.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxStr.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../../Pch.h"
-#pragma hdrstop
+#include "../pnUtStr.h"
#ifdef HS_BUILD_FOR_UNIX
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxSync.cpp b/Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxSync.cpp
similarity index 98%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxSync.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxSync.cpp
index de4510ef..c43bfea2 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxSync.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxSync.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../../Pch.h"
-#pragma hdrstop
+#include "../pnUtSync.h"
#ifdef HS_BUILD_FOR_UNIX
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxUuid.cpp b/Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxUuid.cpp
similarity index 98%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxUuid.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxUuid.cpp
index ca4f3f7c..6722e337 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxUuid.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxUuid.cpp
@@ -45,9 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../../Pch.h"
-#pragma hdrstop
-
+#include "../pnUtUUID.h"
/*****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/W32Int.h b/Sources/Plasma/NucleusLib/pnUtils/Win32/W32Int.h
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/Win32/W32Int.h
rename to Sources/Plasma/NucleusLib/pnUtils/Win32/W32Int.h
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp b/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Addr.cpp
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Addr.cpp
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Dll.cpp b/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Dll.cpp
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Dll.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Dll.cpp
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Misc.cpp b/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Misc.cpp
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Misc.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Misc.cpp
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Path.cpp b/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Path.cpp
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Path.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Path.cpp
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Str.cpp b/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Str.cpp
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Str.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Str.cpp
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Sync.cpp b/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Sync.cpp
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Sync.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Sync.cpp
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Time.cpp b/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Time.cpp
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Time.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Time.cpp
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp b/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Uuid.cpp
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Uuid.cpp
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAddr.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.cpp
similarity index 98%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAddr.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.cpp
index 6279e589..cc798f76 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAddr.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtAddr.h"
/*****************************************************************************
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAddr.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAddr.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.h
index c31756c5..9bc935a1 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAddr.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.h
@@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTADDR_H
+#include "Pch.h"
/*****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAllIncludes.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAllIncludes.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtArray.cpp
similarity index 98%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtArray.cpp
index 52a74857..c7450c99 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtArray.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtArray.h"
/****************************************************************************
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtArray.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtArray.h
index 14d97a77..ba7478e6 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtArray.h
@@ -45,11 +45,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#ifdef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTARRAY_H
-#error "Header $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h included more than once"
-#endif
+#ifndef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTARRAY_H
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTARRAY_H
+#include "Pch.h"
+#include "pnUtSort.h"
/****************************************************************************
*
@@ -1081,3 +1081,4 @@ void TSortArray::Sort () {
SortKey(elem1) > SortKey(elem2)
);
}
+#endif
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtBase64.cpp
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtBase64.cpp
index 5f2a5c2a..09f10687 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtBase64.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtBase64.h"
/*****************************************************************************
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtBase64.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtBase64.h
index b2c49769..f4ba8756 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtBase64.h
@@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTBASE64_H
+#include "Pch.h"
/*****************************************************************************
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtBigNum.cpp
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtBigNum.cpp
index 270e83e6..1537c322 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtBigNum.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtBigNum.h"
#include
#include
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtBigNum.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtBigNum.h
index 675ab4bd..0d2ca4b9 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtBigNum.h
@@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTBIGNUM_H
+#include "Pch.h"
/*****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtCmd.cpp
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtCmd.cpp
index 214c7b8d..5f71810b 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtCmd.cpp
@@ -45,8 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtCmd.h"
+#include "pnUtMisc.h"
/*****************************************************************************
@@ -61,7 +61,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define TOGGLES L"+-"
#define ALL WHITESPACE FLAGS SEPARATORS TOGGLES
+#if HS_BUILD_FOR_WIN32
static const unsigned kMaxTokenLength = MAX_PATH;
+#else
+static const unsigned kMaxTokenLength = 1024;
+#endif
struct CmdArgData {
CmdArgDef def;
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtCmd.h
similarity index 98%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtCmd.h
index 59fadcf5..a6f940b7 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtCmd.h
@@ -50,6 +50,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTCMD_H
+#include "Pch.h"
+#include "pnUtArray.h"
+#include "pnUtStr.h"
/*****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCoreLib.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtCoreLib.h
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCoreLib.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtCoreLib.h
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.cpp
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.cpp
index 1ec4a4ff..6c4a3801 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtCrypt.h"
#include
#include
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.h
index ea08772e..c922fc88 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.h
@@ -50,6 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTCRYPT_H
+#include "Pch.h"
+#include "pnUtArray.h"
/*****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtHash.cpp
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtHash.cpp
index 62cf25f6..92cfb159 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtHash.cpp
@@ -45,9 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
-
+#include "pnUtHash.h"
/****************************************************************************
*
@@ -91,4 +89,4 @@ const uint32_t CHashValue::s_hashTable[] = {
0x4f23137b, 0x9dfd6434, 0xd1e25d94, 0xbad4c88a, 0x0746edf9, 0x8103a9aa, 0xc8c73617, 0xe0f2759a,
0x00161c79, 0xd4545360, 0x1763cc5b, 0x296361fa, 0xbc35858d, 0xdaed5e93, 0x0b9d0aed, 0x01c45a64,
};
-
\ No newline at end of file
+
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtHash.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtHash.h
index b2237185..9e87817c 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtHash.h
@@ -50,6 +50,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTHASH_H
+#include "Pch.h"
+#include "pnUtList.h"
+#include "pnUtArray.h"
+#include "pnUtMath.h"
/****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtList.cpp
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtList.cpp
index 819dc6f2..7ca34e6d 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtList.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtList.h"
/****************************************************************************
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtList.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtList.h
index 2abbbf8d..0bfd4c35 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtList.h
@@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTLIST_H
+#include "Pch.h"
/****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMath.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtMath.cpp
similarity index 98%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMath.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtMath.cpp
index 8677abd6..9d240519 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMath.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtMath.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtMath.h"
/*****************************************************************************
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMath.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtMath.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMath.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtMath.h
index a73362af..0dd99599 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMath.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtMath.h
@@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTMATH_H
+#include "Pch.h"
/*****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMisc.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.cpp
similarity index 98%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMisc.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.cpp
index 3b451fec..76ad8bd2 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMisc.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtMisc.h"
/*****************************************************************************
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMisc.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMisc.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.h
index ea9d425f..69e83f2c 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMisc.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.h
@@ -50,6 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTMISC_H
+#include "Pch.h"
+#include "pnUtArray.h"
/*****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPath.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtPath.cpp
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPath.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtPath.cpp
index c7d3b96a..77549696 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPath.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtPath.cpp
@@ -45,8 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtPath.h"
+#include "pnUtStr.h"
/****************************************************************************
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPath.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtPath.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPath.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtPath.h
index 47da6567..2c984069 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPath.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtPath.h
@@ -50,6 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTPATH_H
+#include "Pch.h"
+#include "pnUtArray.h"
/*****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPragma.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtPragma.h
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPragma.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtPragma.h
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPriQ.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtPriQ.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPriQ.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtPriQ.h
index a6852ac4..cdaa2e5a 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPriQ.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtPriQ.h
@@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTPRIQ_H
+#include "Pch.h"
/****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRand.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtRand.cpp
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRand.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtRand.cpp
index 90fd78b2..4d30e7fe 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRand.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtRand.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtRand.h"
/*****************************************************************************
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRand.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtRand.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRand.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtRand.h
index 437a8664..4ed1bfcf 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRand.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtRand.h
@@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTRAND_H
+#include "Pch.h"
/*****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRef.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtRef.h
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRef.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtRef.h
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSkipList.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtSkipList.h
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSkipList.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtSkipList.h
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSort.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtSort.h
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSort.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtSort.h
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtSpareList.cpp
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtSpareList.cpp
index 562bfafd..75d9e290 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtSpareList.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtSpareList.h"
/****************************************************************************
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtSpareList.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtSpareList.h
index 280c4b1c..5ea63803 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtSpareList.h
@@ -50,6 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTSPARELIST_H
+#include "Pch.h"
+#include
#ifdef HS_DEBUGGING
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtStr.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.cpp
similarity index 98%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtStr.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtStr.cpp
index d75b6d7b..320fec69 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtStr.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtStr.h"
/*****************************************************************************
@@ -522,7 +521,7 @@ const wchar_t * StrChrR (const wchar_t str[], wchar_t ch) {
unsigned StrPrintf (char * dest, unsigned count, const char format[], ...) {
va_list argList;
va_start(argList, format);
- int result = _vsnprintf((char *)dest, count, (const char *)format, argList);
+ int result = hsVsnprintf((char *)dest, count, (const char *)format, argList);
va_end(argList);
return IStrPrintfValidate(dest, count, result);
}
@@ -531,20 +530,20 @@ unsigned StrPrintf (char * dest, unsigned count, const char format[], ...) {
unsigned StrPrintf (wchar_t * dest, unsigned count, const wchar_t format[], ...) {
va_list argList;
va_start(argList, format);
- int result = _vsnwprintf(dest, count, format, argList);
+ int result = hsVsnwprintf(dest, count, format, argList);
va_end(argList);
return IStrPrintfValidate(dest, count, result);
}
//===========================================================================
unsigned StrPrintfV (char * dest, unsigned count, const char format[], va_list args) {
- int result = _vsnprintf(dest, count, format, args);
+ int result = hsVsnprintf(dest, count, format, args);
return IStrPrintfValidate(dest, count, result);
}
//===========================================================================
unsigned StrPrintfV (wchar_t * dest, unsigned count, const wchar_t format[], va_list args) {
- int result = _vsnwprintf(dest, count, format, args);
+ int result = hsVsnwprintf(dest, count, format, args);
return IStrPrintfValidate(dest, count, result);
}
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtStr.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtStr.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h
index 538f0437..64b86309 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtStr.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h
@@ -50,6 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTSTR_H
+#include "Pch.h"
+#include "pnUtArray.h"
/*****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSync.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtSync.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSync.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtSync.h
index 3af3370b..0800e505 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSync.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtSync.h
@@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTSYNC_H
+#include "Pch.h"
/****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTime.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtTime.cpp
similarity index 98%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTime.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtTime.cpp
index 64f1104e..4f892520 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTime.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtTime.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtTime.h"
/*****************************************************************************
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTime.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtTime.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTime.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtTime.h
index 6adebaef..fda2a145 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTime.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtTime.h
@@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTTIME_H
+#include "Pch.h"
/*****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTls.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtTls.cpp
similarity index 98%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTls.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtTls.cpp
index 5686cba8..730af543 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTls.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtTls.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtTls.h"
/*****************************************************************************
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTls.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtTls.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTls.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtTls.h
index 6e9e265c..61ffb6d5 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTls.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtTls.h
@@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTTLS_H
+#include "Pch.h"
/*****************************************************************************
*
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTypes.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtTypes.h
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTypes.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtTypes.h
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.cpp
similarity index 98%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.cpp
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.cpp
index d9997ffc..5cda53ed 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.cpp
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.cpp
@@ -45,8 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
-#include "../Pch.h"
-#pragma hdrstop
+#include "pnUtUuid.h"
const Uuid kNilGuid;
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.h
similarity index 99%
rename from Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h
rename to Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.h
index ab58f1f1..ac163a0e 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.h
@@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTUUID_H
+#include "Pch.h"
/*****************************************************************************
*