commit e2f46128b812f2dfea584897b735e8e0b27c459c Author: John Denker Date: Tue Jan 20 21:20:26 2015 -0700 fixes needed so it will compile diff --git a/src/statics.cpp b/src/statics.cpp index 388f987..fc65e6e 100644 --- a/src/statics.cpp +++ b/src/statics.cpp @@ -134,7 +134,7 @@ StaticIntegrated::StaticIntegrated (prec_t currentAMPS, prec_t wire_radius, POSF #if defined(PREC_DOUBLE) || defined(PREC_FLOAT) calcmap_mem = malloc ((elist.size() + 1) * sizeof (entry)); - calcmap_begin = (entry *)((char *)calcmap_mem + (ptrdiff_t)calcmap_mem % 16); + calcmap_begin = (entry *)((char *)calcmap_mem + (std::ptrdiff_t)calcmap_mem % 16); memcpy (calcmap_begin, &elist[0], elist.size() * sizeof (entry)); calcmap_end = calcmap_begin + elist.size(); std::vector tmp; diff --git a/src/threading.hpp b/src/threading.hpp index cb9696a..33cab8f 100644 --- a/src/threading.hpp +++ b/src/threading.hpp @@ -113,7 +113,7 @@ private: Condition work_cond; Condition ready_cond; volatile bool terminate; - size_t working; + std::size_t working; #ifdef PTHREADS typedef std::vector threads_t;