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

[<axl...@us...>]

Revision: 772
          http://hgengine.svn.sourceforge.net/hgengine/?rev=772&view=rev
Author:   axlecrusher
Date:     2010-12-18 00:10:19 +0000 (Sat, 18 Dec 2010)

Log Message:
-----------
MString to char[].  MString does not seem to work correctly in constant time with optimizations turned on.

Modified Paths:
--------------
    Mercury2/src/MercuryFileDriverMem.cpp
    Mercury2/src/MercuryFileDriverPacked.cpp
    Mercury2/src/MercuryFileDriverZipped.cpp

Modified: Mercury2/src/MercuryFileDriverMem.cpp
===================================================================
--- Mercury2/src/MercuryFileDriverMem.cpp	2010-12-17 21:57:04 UTC (rev 771)
+++ Mercury2/src/MercuryFileDriverMem.cpp	2010-12-18 00:10:19 UTC (rev 772)
@@ -1,6 +1,6 @@
 #include <MercuryFileDriverMem.h>
 
-const MString MemoryFileName = "memory.zip";
+const char MemoryFileName[] = "memory.zip";
 
 /********************FILE DRIVER MEMORY********************/
 

Modified: Mercury2/src/MercuryFileDriverPacked.cpp
===================================================================
--- Mercury2/src/MercuryFileDriverPacked.cpp	2010-12-17 21:57:04 UTC (rev 771)
+++ Mercury2/src/MercuryFileDriverPacked.cpp	2010-12-18 00:10:19 UTC (rev 772)
@@ -2,7 +2,7 @@
 #include <MercuryVector.h>
 #include <string.h>
 
-const MString PackagePrefix = "Packages/";
+const char PackagePrefix[] = "Packages/";
 
 MercuryFileObjectPacked::~MercuryFileObjectPacked()
 {
@@ -103,7 +103,7 @@
 	MVector< MString > out;
 	MercuryFileDriver::Init();
 
-	FILEMAN.ListDirectory( PackagePrefix+"*.*", out, false );
+	FILEMAN.ListDirectory( MString(PackagePrefix)+"*.*", out, false );
 
 	for ( unsigned i = 0; i < out.size(); i++ )
 	{

Modified: Mercury2/src/MercuryFileDriverZipped.cpp
===================================================================
--- Mercury2/src/MercuryFileDriverZipped.cpp	2010-12-17 21:57:04 UTC (rev 771)
+++ Mercury2/src/MercuryFileDriverZipped.cpp	2010-12-18 00:10:19 UTC (rev 772)
@@ -12,7 +12,7 @@
 #  endif
 #endif
 
-const MString PackagePrefix = "Packages/";
+const char PackagePrefix[] = "Packages/";
 
 
 /********************FILE DRIVER ZIPPED*******************/
@@ -172,7 +172,7 @@
 
 	MercuryFileDriver::Init();
 
-	FILEMAN.ListDirectory( PackagePrefix+"*.zip", out, false );
+	FILEMAN.ListDirectory( MString(PackagePrefix)+"*.zip", out, false );
 	for ( i = 0; i < out.size(); i++ )
 		out[i] = PackagePrefix + out[i];
 


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