From b4f9506d2747269b65c55579d3232fa1e7f99e61 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sat, 25 Sep 2010 22:43:11 +0200
Subject: [PATCH] Fixed: Some compilation errors

---
 code/CMakeLists.txt                                   |  8 ++++----
 .../tools/misc/extract_filename/extract_filename.cpp  | 11 +++++++----
 code/nel/tools/misc/lock/lock.cpp                     |  7 +++----
 code/ryzom/client/src/interface_v3/group_map.h        |  2 +-
 code/ryzom/client/src/r2/editor.h                     |  2 +-
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index fb98670ac..03df44113 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -81,6 +81,10 @@ FIND_PACKAGE(Jpeg)
 IF(WIN32)
   INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
   SET(WINSOCK2_LIB ws2_32.lib)
+
+  IF(WITH_MFC)
+    FIND_PACKAGE(CustomMFC REQUIRED)
+  ENDIF(WITH_MFC)
 ENDIF(WIN32)
 
 IF(WITH_STATIC)
@@ -89,10 +93,6 @@ IF(WITH_STATIC)
   SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${WINSOCK2_LIB})
 ENDIF(WITH_STATIC)
 
-IF(WITH_MFC)
-  FIND_PACKAGE(CustomMFC REQUIRED)
-ENDIF(WITH_MFC)
-
 IF(WITH_STLPORT)
   FIND_PACKAGE(STLport REQUIRED)
   INCLUDE_DIRECTORIES(${STLPORT_INCLUDE_DIR})
diff --git a/code/nel/tools/misc/extract_filename/extract_filename.cpp b/code/nel/tools/misc/extract_filename/extract_filename.cpp
index a6844be0f..b20656dee 100644
--- a/code/nel/tools/misc/extract_filename/extract_filename.cpp
+++ b/code/nel/tools/misc/extract_filename/extract_filename.cpp
@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <nel/misc/file.h>
-#include <nel/misc/config_file.h>
+#include "nel/misc/file.h"
+#include "nel/misc/config_file.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -134,7 +134,10 @@ void removeDirectory (string &str)
 	// Remove begin space
 	string::size_type pos = str.rfind ('\\');
 	string::size_type pos2 = str.rfind ('/');
-	pos = std::max (pos, pos2);
+
+	if (pos == string::npos)
+		pos = pos2;
+
 	if (pos != string::npos)
 		str = str.substr (pos+1, str.size());
 }
@@ -269,7 +272,7 @@ void extractStringsFromASCII (const vector<char> &fileArray, set<string> &filena
 				if (end != begin)
 				{
 					// String size
-					uint size = (uint)end-(uint)begin;
+					uint size = (uint)(end-begin);
 					temp.resize (size);
 
 					// Copy the string
diff --git a/code/nel/tools/misc/lock/lock.cpp b/code/nel/tools/misc/lock/lock.cpp
index acdecd1ed..efdda5d73 100644
--- a/code/nel/tools/misc/lock/lock.cpp
+++ b/code/nel/tools/misc/lock/lock.cpp
@@ -14,10 +14,9 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "stdafx.h"
-#include <nel/misc/types_nl.h>
-#include <nel/misc/time_nl.h>
-#include <nel/misc/common.h>
+#include "nel/misc/types_nl.h"
+#include "nel/misc/time_nl.h"
+#include "nel/misc/common.h"
 #include <stdio.h>
 
 using namespace NLMISC;
diff --git a/code/ryzom/client/src/interface_v3/group_map.h b/code/ryzom/client/src/interface_v3/group_map.h
index 9449b070e..9f88b2893 100644
--- a/code/ryzom/client/src/interface_v3/group_map.h
+++ b/code/ryzom/client/src/interface_v3/group_map.h
@@ -522,7 +522,7 @@ private:
 
 	void updateSelectionAxisSize();
 	CViewBitmap *newSelectionAxis(NLMISC::CRGBA color);
-	void computeFrustumQuad(CQuad &fruQuad) const;
+	void computeFrustumQuad(NLMISC::CQuad &fruQuad) const;
 };
 
 #endif
diff --git a/code/ryzom/client/src/r2/editor.h b/code/ryzom/client/src/r2/editor.h
index ecf6daa97..27ca896ea 100644
--- a/code/ryzom/client/src/r2/editor.h
+++ b/code/ryzom/client/src/r2/editor.h
@@ -998,7 +998,7 @@ T *createObjectFromClassName(const std::string &className)
 	if (className.empty()) return NULL;
 	try
 	{
-		IClassable	*obj = NLMISC::CClassRegistry::create(className);
+		NLMISC::IClassable *obj = NLMISC::CClassRegistry::create(className);
 		if (!obj)
 		{
 			nlwarning("Couldn't create object of class %s", className.c_str());