From 24e2e07ef42932c42bf5c55c8f57b6f9b26d182b Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Thu, 26 May 2011 16:20:17 +0200
Subject: [PATCH] Changed: #878 Fix typos in comments/code

---
 code/nel/samples/3d/font/main.cpp   | 3 +--
 code/nel/src/georges/form_elm.cpp   | 1 +
 code/nel/src/misc/shared_memory.cpp | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/nel/samples/3d/font/main.cpp b/code/nel/samples/3d/font/main.cpp
index 1a417cae7..e834c4620 100644
--- a/code/nel/samples/3d/font/main.cpp
+++ b/code/nel/samples/3d/font/main.cpp
@@ -42,7 +42,6 @@ using namespace std;
 using namespace NL3D;
 using namespace NLMISC;
 
-
 #ifdef NL_OS_WINDOWS
 int WINAPI WinMain( HINSTANCE hInstance, 
 									 HINSTANCE hPrevInstance, 
@@ -139,7 +138,7 @@ int main(int argc, char **argv)
 		tc.setScaleX (scale);
 		tc.setScaleZ (scale);
 		tc.printAt (0.1f, 0.3f, string("printAt Scale String"));
-		
+
 		// display the same string with no scale
 		tc.setHotSpot (CComputedString::TopLeft);
 		tc.setScaleX (1.0f);
diff --git a/code/nel/src/georges/form_elm.cpp b/code/nel/src/georges/form_elm.cpp
index 528f6eec9..6f2f4c523 100644
--- a/code/nel/src/georges/form_elm.cpp
+++ b/code/nel/src/georges/form_elm.cpp
@@ -233,6 +233,7 @@ const CType* CFormElm::getType ()
 	warning (false, "getType", "This node is not an atom.");
 	return 0;
 }
+
 // ***************************************************************************
 
 bool CFormElm::getValue (string &/* result */, TEval /* evaluate */) const
diff --git a/code/nel/src/misc/shared_memory.cpp b/code/nel/src/misc/shared_memory.cpp
index 60d63b7d7..bb19981eb 100644
--- a/code/nel/src/misc/shared_memory.cpp
+++ b/code/nel/src/misc/shared_memory.cpp
@@ -36,8 +36,8 @@ namespace NLMISC {
 	// Storage for file handles, necessary to close the handles
 	map<void*,HANDLE>	AccessAddressesToHandles;
 #else
-  // Storage for shmid, necessary to destroy the segments
-  map<TSharedMemId, int>   SharedMemIdsToShmids;
+	// Storage for shmid, necessary to destroy the segments
+	map<TSharedMemId, sint>   SharedMemIdsToShmids;
 #endif
 
 
@@ -71,7 +71,7 @@ void			*CSharedMemory::createSharedMemory( TSharedMemId sharedMemId, uint32 size
 #else
 
 	// Create a shared memory segment
-	int shmid = shmget( sharedMemId, size, IPC_CREAT | IPC_EXCL | 0666 );
+	sint shmid = shmget( sharedMemId, size, IPC_CREAT | IPC_EXCL | 0666 );
 	if ( shmid == -1 )
 		return NULL;
 	SharedMemIdsToShmids.insert( make_pair( sharedMemId, shmid ) );
@@ -82,6 +82,7 @@ void			*CSharedMemory::createSharedMemory( TSharedMemId sharedMemId, uint32 size
 		return NULL;
 	else
 		return accessAddress;
+
 #endif
 }