windows compile fixes

jpn-- · Feb 27, 2017 · e9e985f · e9e985f
1 parent 4bb1307
commit e9e985f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/etk/etk_ndarray.cpp b/src/etk/etk_ndarray.cpp
@@ -1058,7 +1058,7 @@ void ndarray::logsumexp_2 (ndarray* out, const size_t& siz1, const size_t& siz2)
 //				out->operator()(x1) = ::log(temp);
 //			}
 //		}
-		ThreadPool::ParallelFor0((unsigned long)0, siz1, [&](size_t& x1){
+		ThreadPool::ParallelFor0((std::size_t)0, siz1, [&](size_t& x1){
 				double temp =0;
 				for ( unsigned x2=0; x2<siz2; x2++ ) { temp += ::exp(this->operator()(x1,x2)); }
 				out->operator()(x1) = ::log(temp);

diff --git a/src/model/elm_model2_mnl.cpp b/src/model/elm_model2_mnl.cpp
@@ -377,7 +377,7 @@ std::shared_ptr<ndarray> elm::Model2::calc_logsums(ndarray* u) const
 //			std::cout << c << ", thread " << k.threadnum << std::endl;
 		};
 
-		ThreadPool::ParallelFor<local_workspace>((unsigned long)0, u->size1(), f, nNodes);
+		ThreadPool::ParallelFor<local_workspace>((std::size_t)0, u->size1(), f, nNodes);
 
 
 	} else {

diff --git a/src/model/elm_workshop_d_logsums.cpp b/src/model/elm_workshop_d_logsums.cpp
@@ -120,7 +120,7 @@ void elm::d_logsums_w::work(size_t firstcase, size_t numberofcases, boosted::mut
 		nVarsUCA = UtilPacket.Data_CA->nVars();
 	} else if (UtilPacket.Data_CE && UtilPacket.Data_CE->nalts()>0) {
 		nVarsUCA = UtilPacket.Data_CE->nvars();
-		OOPS_NotImplemented('CE not implemented here');
+		OOPS_NotImplemented("CE not implemented here");
 	}
 
 	unsigned nVarsUCO = 0;
@@ -133,7 +133,7 @@ void elm::d_logsums_w::work(size_t firstcase, size_t numberofcases, boosted::mut
 		nVarsQCA = QuantPacket.Data_CA->nVars();
 	} else if (QuantPacket.Data_CE && QuantPacket.Data_CE->nalts()>0) {
 		nVarsQCA = QuantPacket.Data_CE->nvars();
-		OOPS_NotImplemented('CE not implemented here');
+		OOPS_NotImplemented("CE not implemented here");
 	}