const correctness fix

Ingrater · Jun 8, 2013 · abddeee · abddeee
1 parent 663de8f
commit abddeee
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/common2010.suo b/common2010.suo
diff --git a/src/common.visualdproj b/src/common.visualdproj
@@ -536,8 +536,8 @@ cd %CWD%</preBuildCommand>
   <useArrayBounds>0</useArrayBounds>
   <noboundscheck>1</noboundscheck>
   <useSwitchError>0</useSwitchError>
-  <useUnitTests>1</useUnitTests>
-  <useInline>1</useInline>
+  <useUnitTests>0</useUnitTests>
+  <useInline>0</useInline>
   <release>1</release>
   <preservePaths>0</preservePaths>
   <warnings>0</warnings>
@@ -550,8 +550,8 @@ cd %CWD%</preBuildCommand>
   <Dversion>2</Dversion>
   <ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
   <compiler>0</compiler>
-  <otherDMD>0</otherDMD>
-  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
+  <otherDMD>1</otherDMD>
+  <program>$(DMDInstallDir)windows\bin-nostd\dmd.exe</program>
   <imppath>$(ProjectDir)\..\..\druntime\import;$(ProjectDir)\..\..\phobos;</imppath>
   <fileImppath />
   <outdir>$(ConfigurationName)</outdir>
@@ -594,14 +594,14 @@ cd %CWD%</preBuildCommand>
   <resfile />
   <exefile>$(OutDir)\$(ProjectName).exe</exefile>
   <useStdLibPath>1</useStdLibPath>
-  <additionalOptions>-defaultlib=phobosnogc -debuglib=phobosnogc $(ProjectDir)\..\..\druntime\lib\gcstub.obj</additionalOptions>
-  <preBuildCommand>set CWD=%CD%
-cd $(ProjectDir)\..\..\druntime
-$(DMDInstallDir)windows\bin\make -f win32nogc.mak
-if errorlevel 1 goto reportError
-cd $(ProjectDir)\..\..\phobos
-$(DMDInstallDir)windows\bin\make -f win32nogc.mak
-if errorlevel 1 goto reportError
+  <additionalOptions>-defaultlib=phobosnogc64 -debuglib=phobosnogc64 -L/LIBPATH:&quot;$(ProjectDir)\..\..\thBase\lib&quot; -L/LIBPATH:&quot;$(ProjectDir)\..\..\phobos&quot;</additionalOptions>
+  <preBuildCommand>set CWD=%CD%
+cd $(ProjectDir)\..\..\druntime
+$(DMDInstallDir)windows\bin\make -f win32nogc.mak
+if errorlevel 1 goto reportError
+cd $(ProjectDir)\..\..\phobos
+$(DMDInstallDir)windows\bin\make -f win32nogc.mak
+if errorlevel 1 goto reportError
 cd %CWD%</preBuildCommand>
   <postBuildCommand />
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>

diff --git a/src/thBase/chunkfile.d b/src/thBase/chunkfile.d
@@ -93,7 +93,6 @@ class Chunkfile
     {
       assert(m_operation != Operation.Write, "can not read in write operation");
       assert(m_readInfo.size == 0 || m_readInfo.top.bytesLeft >= bytes, "reading over chunk boundary");
-      size_t size;
       if(m_operation == Operation.Read)
       {
         m_file.skip(bytes);

diff --git a/src/thBase/stream.d b/src/thBase/stream.d
@@ -226,9 +226,9 @@ class FileInStream : IInputStream
     RawFile m_file;
 
   public:
-    this(string filename)
+    this(const(char)[] filename)
     {
-      m_file = RawFile(filename,"rb");
+      m_file = RawFile(filename, "rb");
       if(!m_file.isOpen())
       {
         throw New!StreamException(format("Couldn't open file '%s' for reading", filename));