Fixed VS compilation problem ('free' is a macro) by renaming free to deallocate.

Updated VS 9 project file.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9889 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/guiengine/engine.cpp

@@ -875,10 +875,10 @@ namespace GUIEngine
       * some cached data but does not actually uninitialize the gui engine. This
       * does.
       */
-    void free()
+    void deallocate()
     {
         g_loaded_screens.clearAndDeleteAll();
-    }
+    }   // deallocate
     
     // ------------------------------------------------------------------------
     void init(IrrlichtDevice* device_a, IVideoDriver* driver_a, 

src/guiengine/engine.hpp

@@ -102,7 +102,7 @@ namespace GUIEngine
     
     void cleanUp();
     
-    void free();
+    void deallocate();
     
     
     /**

src/guiengine/event_handler.cpp

@@ -308,11 +308,11 @@ EventHandler* EventHandler::get()
     return event_handler_singleton;
 }
 
-void EventHandler::free()
+void EventHandler::deallocate()
 {
     delete event_handler_singleton;
     event_handler_singleton = NULL;
-}
+}   // deallocate
 
 
 // -----------------------------------------------------------------------------

src/guiengine/event_handler.hpp

@@ -96,7 +96,7 @@ namespace GUIEngine
         
         /** singleton access */
         static EventHandler* get();
-        static void free();
+        static void deallocate();
     };
     
 }

src/ide/vc9/supertuxkart.vcproj

@@ -438,6 +438,10 @@
 					RelativePath="..\..\utils\constants.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\utils\leak_check.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\utils\profiler.cpp"
 					>
@@ -1472,6 +1476,10 @@
 					RelativePath="..\..\utils\constants.hpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\utils\leak_check.hpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\utils\no_copy.hpp"
 					>

src/main.cpp

@@ -927,8 +927,8 @@ void cleanSuperTuxKart()
     if(file_manager)            delete file_manager;
     if(irr_driver)              delete irr_driver;
     
-    StateManager::free();
+    StateManager::deallocate();
-    GUIEngine::EventHandler::free();
+    GUIEngine::EventHandler::deallocate();
 }   // cleanSuperTuxKart
 
 //=============================================================================

src/states_screens/state_manager.cpp

@@ -43,11 +43,11 @@ StateManager* StateManager::get()
     return state_manager_singleton;
 }   // get
 
-void StateManager::free()
+void StateManager::deallocate()
 {
     delete state_manager_singleton;
     state_manager_singleton = NULL;
-}
+}   // deallocate
 
 
 // ============================================================================
@@ -225,7 +225,7 @@ void StateManager::onTopMostScreenChanged()
 void StateManager::onStackEmptied()
 {
     GUIEngine::cleanUp();
-    GUIEngine::free();
+    GUIEngine::deallocate();
     main_loop->abort();
 }   // onStackEmptied
 

src/states_screens/state_manager.hpp

@@ -181,7 +181,7 @@ public:
     
     // singleton
     static StateManager* get();
-    static void free();
+    static void deallocate();
     
 private:
     /**