From 274c3d2bd6f670431db3bd5e1dd6863d260554d4 Mon Sep 17 00:00:00 2001
From: dmayerich <dmayerich@gmail.com>
Date: Mon, 30 Dec 2013 00:12:46 -0600
Subject: [PATCH] fixed visual studio warnings

---
 CMakeLists.txt | 2 +-
 montecarlo.cpp | 4 ++--
 nearfield.cpp  | 6 +++---
 options.h      | 6 +++---
 sphere.h       | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7df99da..28fb22a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}")
 set(Boost_USE_STATIC_LIBS        ON)
 set(Boost_USE_MULTITHREADED      ON)
 set(Boost_USE_STATIC_RUNTIME    OFF)
-find_package( Boost 1.49.0 COMPONENTS program_options )
+find_package( Boost 1.46.0 COMPONENTS program_options )
 
 #find the Qt4
 find_package(Qt4 REQUIRED)
diff --git a/montecarlo.cpp b/montecarlo.cpp
index edb37dd..0690d20 100644
--- a/montecarlo.cpp
+++ b/montecarlo.cpp
@@ -45,8 +45,8 @@ void mcSampleNA(bsVector* samples, int N, bsVector k, ptype NAin, ptype NAout)
     ptype z, phi, theta;
     for(int i=0; i<N; i++)
     {
-        z = ((double)rand() / (double)RAND_MAX) * rangeZ + outZ;
-        theta = ((double)rand() / (double)RAND_MAX) * 2 * PI;
+        z = ((ptype)rand() / (ptype)RAND_MAX) * rangeZ + outZ;
+        theta = ((ptype)rand() / (ptype)RAND_MAX) * 2 * (ptype)PI;
 
         //calculate theta
         phi = acos(z);
diff --git a/nearfield.cpp b/nearfield.cpp
index 2802520..2a32fbb 100644
--- a/nearfield.cpp
+++ b/nearfield.cpp
@@ -106,7 +106,7 @@ void nearfieldStruct::calcSpheres()
 
 
 	//for each sphere
-	for(int i=0; i<sVector.size(); i++)
+	for(unsigned int i=0; i<sVector.size(); i++)
 	{
 		//a = sVector[i].a;
 
@@ -203,7 +203,7 @@ void nearfieldStruct::calcBesselLut(ptype* j, ptype d_min, ptype d_max, int dR)
         bessjyv_sph(Nl, kd, vm, cjv_kd, cyv_kd, cjvp_kd, cyvp_kd);
 
         //copy the double data to the bsComplex array
-        for(int l=0; l<=Nl; l++)
+        for(unsigned int l=0; l<=Nl; l++)
 		{
             jv = cjv_kd[l];
 			if(isnan(jv) || isinf(jv))
@@ -223,7 +223,7 @@ void nearfieldStruct::calcBesselLut(ptype* j, ptype d_min, ptype d_max, int dR)
         for(int ir = 0; ir < dR; ir++)
         {
             outfile<<ir*dr + d_min<<endl;
-            for(int l = 0; l<=Nl; l++)
+            for(unsigned int l = 0; l<=Nl; l++)
             {
                 outfile<<j[ir * (Nl+1) + l]<<" -- ";
             }
diff --git a/options.h b/options.h
index e8cefa6..586fabf 100644
--- a/options.h
+++ b/options.h
@@ -286,7 +286,7 @@ void lSpheres(po::variables_map vm)
 
         vector<string> filenames = vm["sphere-file"].as< vector<string> >();
         //load each file
-        for(int iS=0; iS<filenames.size(); iS++)
+        for(unsigned int iS=0; iS<filenames.size(); iS++)
         {
             //load the file into a string
             std::ifstream ifs(filenames[iS].c_str());
@@ -338,7 +338,7 @@ static void lMaterials(po::variables_map vm)
 		}
 		else
 		{
-			for(int i=0; i<matVec.size(); i+=2)
+			for(unsigned int i=0; i<matVec.size(); i+=2)
 			{
 				rts::material<ptype> newM(SCOPE->nf.lambda, matVec[i], matVec[i+1]);
 				SCOPE->nf.mVector.push_back(newM);
@@ -350,7 +350,7 @@ static void lMaterials(po::variables_map vm)
 	if(vm.count("material-file"))
 	{
         vector<string> filenames = vm["material-file"].as< vector<string> >();
-        for(int i=0; i<filenames.size(); i++)
+        for(unsigned int i=0; i<filenames.size(); i++)
         {
             //load the file into a string
             std::ifstream ifs(filenames[i].c_str());
diff --git a/sphere.h b/sphere.h
index 7723c8c..e3aebe7 100644
--- a/sphere.h
+++ b/sphere.h
@@ -20,7 +20,7 @@ struct sphere
     ptype a;
 
     //sphere material index
-    int iMaterial;
+    unsigned int iMaterial;
 
     //GPU pointer to the scattered field produced by a plane wave
     //  this is a function of cos(theta) and |r| (distance from sphere center)
--
libgit2 0.21.4