Fixed some errors for Windows VS compilation

arch.h

@@ -5,11 +5,12 @@
 #ifndef __ARCH_H
 #define __ARCH_H
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(WIN32) || defined(WIN64)
 
 #include <process.h>
 #include <direct.h>
 #include <float.h>
+#include <stdlib.h>
 #include <time.h>
 
 #define __func__ __FUNCTION__
@@ -21,14 +22,13 @@
 
 // avoid annoying warnings
 #define hypot _hypot
-#define isnan(x) _isnan((x))
 #define getpid() _getpid()
 #define getcwd(buffer,maxlen) _getcwd(buffer,maxlen)
 #define unlink(fname) _unlink(fname)
 
 inline double drand48(void) { return (double)rand()/(double)RAND_MAX; }
 // quick fix of missing function. this should be improved upon!
 
-#endif //_WIN32
+#endif // WINxx
 
 #endif // !__ARCH_H

src/libmath/timing.cc

@@ -31,7 +31,7 @@ static double tick_per_sec ()
 {
     clock_t ticks_per_second;
 
-#if defined (_WIN32) || defined(_WIN64)
+#if defined (WIN32) || defined(WIN64)
     ticks_per_second = 100;
 #else
 #ifndef CLK_TCK

src/libparam2001/legendre.h

@@ -11,7 +11,7 @@ int factorial(int i);
 
 double plgndr(int l, int m, double x);
 
-toast::complex SphericalHarmonic(int l,int m, double thi, double fi); // calculates the spherical harmonic
+std::complex<double> SphericalHarmonic(int l,int m, double thi, double fi); // calculates the spherical harmonic
                                                                //of degree l order m
                                                                // at the (thi,fi) point
 #endif

src/libparam2001/pplot3d.cc

@@ -12,7 +12,6 @@
 #include "legendre.h"
 #include "pplot3d.h"
 
-using namespace toast;
 using namespace std;
 
 
@@ -70,7 +69,7 @@ CVector  myCCompRowMatrix::DiagATA ()
       for(int j=0;j<At.nCols();j++)
 	{
 	  //  cerr<<i<<"  " <<At(i,j)<<endl;
-	  if(At.Get(i,j)!=0)  Diag[i]+=At(i,j)*At(i,j); 
+	  if(At.Get(i,j) != 0.0)  Diag[i]+=At(i,j)*At(i,j); 
 	}
     }
 
@@ -89,7 +88,7 @@ CCompRowMatrix myCCompRowMatrix::AttA ()
   At.Transpone();
 
   int i, j,k;//, n = nCols();
-  toast::complex at_ik, at_jk;
+  std::complex<double> at_ik, at_jk;
   // cerr<<"A"<<endl;
   //CCoordMatrix ata(At.nRows(), At.nRows());
   CDenseMatrix ata2(At.nRows(), At.nRows());
@@ -99,7 +98,7 @@ CCompRowMatrix myCCompRowMatrix::AttA ()
       {
       for(k=0;k<At.nCols();k++)
 	{
-	  if((at_ik = At.Get(i,k))!=0 && (at_jk = At.Get(j,k))!=0)
+	  if((at_ik = At.Get(i,k))!=0.0 && (at_jk = At.Get(j,k))!=0.0)
 	    {
 	      ata2(i,j)+=at_ik*at_jk;
 	    }

src/libsharm/diffusphere.cc

@@ -11,7 +11,6 @@
 #include "felib.h"
 #include "sharmlib.h"
 #include "diffusphere.h"
-using namespace toast;
 using namespace std;
 
 

src/libstoast/GLProjector.cc

@@ -1,4 +1,8 @@
 #define STOASTLIB_IMPLEMENTATION
+
+#if defined(WIN32) || defined(WIN64)
+#include <windows.h>
+#endif
 #include "stoastlib.h"
 #include "GLProjector.h"
 #include "GL/gl.h"

src/matlab/toastDisplace.cc

@@ -7,7 +7,6 @@
 #include "mex.h"
 #include "util.h"
 using namespace std;
-using namespace toast;
 
 const double M_PI=3.141592653589793;
 //#define OUTPUT_SYSMAT 1

toastdef.h

@@ -3,6 +3,11 @@
 // A list of DEFINEs which fine tune TOAST compilation options
 // ==========================================================================
 
+#ifndef __TOASTDEF_H
+#define __TOASTDEF_H
+
+#include "arch.h"
+
 #if defined(WIN32)||defined(WIN64)
 #define NEED_EXPLICIT_INSTANTIATION   // JK in Windows (VS2005) explicit instantiation is required
 #endif
@@ -99,3 +104,5 @@
 //#define MPI_FWDSOLVER
 
 #endif
+
+#endif // !__TOASTDEF_H

win/VS2008/libfe/libfe.vcproj

@@ -102,7 +102,7 @@
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\resources\toastlib.vsprops"
+			InheritedPropertySheets="..\resources\toastlib.vsprops;..\resources\toast_x64.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -258,7 +258,7 @@
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\resources\toastlib.vsprops"
+			InheritedPropertySheets="..\resources\toastlib.vsprops;..\resources\toast_x64.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -419,7 +419,7 @@
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\resources\toastlib.vsprops"
+			InheritedPropertySheets="..\resources\toastlib.vsprops;..\resources\toast_x64.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>

win/VS2008/libmath/libmath.vcproj

@@ -99,11 +99,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\resources\toastlib.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
+			InheritedPropertySheets="..\resources\toastlib.vsprops;..\resources\toast_x64.vsprops"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -119,15 +120,18 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				WholeProgramOptimization="false"
+				Optimization="0"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBMATH_EXPORTS"
-				RuntimeLibrary="2"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBMATH_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="2"
+				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -143,14 +147,13 @@
 				Name="VCLinkerTool"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="false"
+				IgnoreAllDefaultLibraries="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -176,9 +179,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release_fdot|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Release|Win32"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\resources\toastlib.vsprops"
 			CharacterSet="0"
@@ -207,7 +208,6 @@
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="2"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -256,12 +256,13 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Release|x64"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\resources\toastlib.vsprops"
-			CharacterSet="1"
+			InheritedPropertySheets="..\resources\toastlib.vsprops;..\resources\toast_x64.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -281,14 +282,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBMATH_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;LIBMATH_EXPORTS"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="2"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -302,12 +301,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="libblas64.lib SuperLU_43.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="false"
-				GenerateDebugInformation="true"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="false"
 				SubSystem="2"
-				LinkTimeCodeGeneration="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="17"
@@ -336,9 +338,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Release_fdot|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\resources\toastlib.vsprops"
 			CharacterSet="0"
@@ -358,7 +360,6 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -368,6 +369,7 @@
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="2"
+				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -381,8 +383,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="false"
-				AdditionalDependencies="libblas64.lib SuperLU_43.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				IgnoreDefaultLibraryNames=""
@@ -392,7 +392,7 @@
 				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -422,7 +422,7 @@
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\resources\toastlib.vsprops"
+			InheritedPropertySheets="..\resources\toastlib.vsprops;..\resources\toast_x64.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -450,7 +450,6 @@
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="2"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -507,10 +506,6 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File
-				RelativePath="..\..\..\src\libmath\complex.cc"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\libmath\cr_cholesky.cc"
 				>
@@ -547,10 +542,6 @@
 				RelativePath="..\..\..\src\libmath\nr.cc"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\libmath\scomplex.cc"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\libmath\scrmatrix.cc"
 				>
@@ -585,10 +576,6 @@
 				RelativePath="..\..\..\src\libmath\cdmatrix_imp.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\libmath\complex.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\libmath\cr_cholesky.h"
 				>
@@ -677,10 +664,6 @@
 				RelativePath="..\..\..\src\libmath\precon_imp.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\libmath\scomplex.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\libmath\scrmatrix.h"
 				>