From 3000e99796a7ce628cfe93de83b29bf97500b18e Mon Sep 17 00:00:00 2001
From: Darryl Pogue <dvpdiner2@gmail.com>
Date: Sat, 6 Aug 2011 14:24:28 -0700
Subject: [PATCH] Some fixes for pnNetBase.

---
 Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbAllIncludes.h | 2 +-
 Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbError.h       | 4 ++--
 Sources/Plasma/NucleusLib/pnNetBase/pnNbConst.h               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbAllIncludes.h b/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbAllIncludes.h
index 210d836c..6c0137a6 100644
--- a/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbAllIncludes.h
+++ b/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbAllIncludes.h
@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pnProduct/pnProduct.h"
 
-#include "pnNbConst.h"
+#include "../pnNbConst.h"
 #include "pnNbError.h"
 #include "pnNbKeys.h"
 #include "pnNbProtocol.h"
diff --git a/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbError.h b/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbError.h
index 4979572a..b0ab5fe9 100644
--- a/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbError.h
+++ b/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbError.h
@@ -103,10 +103,10 @@ enum ENetError {
     kNumNetErrors,
 
     // Net messages require ENetError to be sizeof(dword)
-    kNetErrorForceDword             = (dword) -1
+    kNetErrorForceDword             = (dword)(-1)
 };
 
-COMPILER_ASSERT_HEADER(pnNbError, sizeof(ENetError) == sizeof(dword));
+//COMPILER_ASSERT_HEADER(pnNbError, sizeof(ENetError) == sizeof(dword));
 
 #define IS_NET_ERROR(a)     (((int)(a)) > kNetSuccess)
 #define IS_NET_SUCCESS(a)   (((int)(a)) == kNetSuccess)
diff --git a/Sources/Plasma/NucleusLib/pnNetBase/pnNbConst.h b/Sources/Plasma/NucleusLib/pnNetBase/pnNbConst.h
index bfe97fe9..371ee5e2 100644
--- a/Sources/Plasma/NucleusLib/pnNetBase/pnNbConst.h
+++ b/Sources/Plasma/NucleusLib/pnNetBase/pnNbConst.h
@@ -90,7 +90,7 @@ const unsigned kBillingTypeGameTap              = 1 << 1;
 
 struct AccountRoleInfo {
     unsigned    Role;
-    char*       Descriptor;
+    const char* Descriptor;
 };
 
 // Account role flags