[Hgengine-cvs] SF.net SVN: hgengine:[386] Mercury2/src

[<cn...@us...>]

Revision: 386
          http://hgengine.svn.sourceforge.net/hgengine/?rev=386&view=rev
Author:   cnlohr
Date:     2009-06-28 21:58:37 +0000 (Sun, 28 Jun 2009)

Log Message:
-----------
cleanup - Actually use Mercury Vector, instead of the crazy #define happenstance.

Modified Paths:
--------------
    Mercury2/src/MercuryFile.cpp
    Mercury2/src/MercuryFile.h
    Mercury2/src/MercuryFileDriverDirect.cpp
    Mercury2/src/MercuryFileDriverPacked.cpp
    Mercury2/src/MercuryFileDriverZipped.cpp

Modified: Mercury2/src/MercuryFile.cpp
===================================================================
--- Mercury2/src/MercuryFile.cpp	2009-06-28 21:57:18 UTC (rev 385)
+++ Mercury2/src/MercuryFile.cpp	2009-06-28 21:58:37 UTC (rev 386)
@@ -1,5 +1,5 @@
 #include "MercuryFile.h"
-
+#include <MercuryVector.h>
 #include <MercuryFileDriverDirect.h>
 #include <MercuryFileDriverNet.h>
 #include <MercuryFileDriverMem.h>

Modified: Mercury2/src/MercuryFile.h
===================================================================
--- Mercury2/src/MercuryFile.h	2009-06-28 21:57:18 UTC (rev 385)
+++ Mercury2/src/MercuryFile.h	2009-06-28 21:58:37 UTC (rev 386)
@@ -4,11 +4,10 @@
 #include <MAutoPtr.h>
 #include <MercuryUtil.h>
 
-#include <vector>
+//Forward decleration, as there's no real need to have this included unless we _need_ it.
+template< typename t >
+class MVector;
 
-//XXX When we write a Mercury Vector, replace this line  !!! XXX !!! NOTE
-#define MVector std::vector
-
 ///File permissions (self-explainatory)
 enum FilePermission
 {

Modified: Mercury2/src/MercuryFileDriverDirect.cpp
===================================================================
--- Mercury2/src/MercuryFileDriverDirect.cpp	2009-06-28 21:57:18 UTC (rev 385)
+++ Mercury2/src/MercuryFileDriverDirect.cpp	2009-06-28 21:58:37 UTC (rev 386)
@@ -1,4 +1,5 @@
-#include "MercuryFileDriverDirect.h"
+#include <MercuryFileDriverDirect.h>
+#include <MercuryVector.h>
 
 #ifndef WIN32
 #include <dirent.h>

Modified: Mercury2/src/MercuryFileDriverPacked.cpp
===================================================================
--- Mercury2/src/MercuryFileDriverPacked.cpp	2009-06-28 21:57:18 UTC (rev 385)
+++ Mercury2/src/MercuryFileDriverPacked.cpp	2009-06-28 21:58:37 UTC (rev 386)
@@ -1,4 +1,5 @@
 #include <MercuryFileDriverPacked.h>
+#include <MercuryVector.h>
 #include <string.h>
 
 const MString PackagePrefix = "Packages/";

Modified: Mercury2/src/MercuryFileDriverZipped.cpp
===================================================================
--- Mercury2/src/MercuryFileDriverZipped.cpp	2009-06-28 21:57:18 UTC (rev 385)
+++ Mercury2/src/MercuryFileDriverZipped.cpp	2009-06-28 21:58:37 UTC (rev 386)
@@ -1,14 +1,15 @@
 #include <MercuryFileDriverZipped.h>
 #include <MercuryFileDriverPacked.h>
+#include <MercuryVector.h>
 
 //For the store compression on zips
 #include <zlib.h>
 #include <string.h>
 
-#if defined(WIN32)
-#  if defined(_MSC_VER)
-#    pragma comment(lib, "zdll.lib")
-#  endif
+#if defined(WIN32)
+#  if defined(_MSC_VER)
+#    pragma comment(lib, "zdll.lib")
+#  endif
 #endif
 
 const MString PackagePrefix = "Packages/";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.