vs2015対応

ai5 · Sep 9, 2015 · 154e5c8 · 154e5c8
1 parent 3953185
commit 154e5c8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Apery/Apery.vcxproj b/Apery/Apery.vcxproj
@@ -105,7 +105,7 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WholeProgramOptimization>PGOptimize</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='HiyokoRelease|x64'" Label="Configuration">

diff --git a/src/evaluate.hpp b/src/evaluate.hpp
@@ -488,7 +488,17 @@ template <typename KPPType, typename KKPType, typename KKType> struct EvaluaterB
 							std::tuple<Color, File, Rank> ituple = std::make_tuple(icolor, diff_file_kito, diff_rank_kito);
 							std::tuple<Color, File, Rank> jtuple = std::make_tuple(jcolor, diff_file_kjto, diff_rank_kjto);
 							if (jtuple < ituple)
+                            {
+#if 0
 								std::swap(ituple, jtuple);
+#else
+                              std::tuple<Color, File, Rank> temp;
+                              temp = ituple;
+                              ituple = jtuple;
+                              jtuple = temp;
+#endif
+                            }
+
 							ret[retIdx++] = std::make_pair(&r_kee[std::get<0>(ituple)][R_Mid + std::get<1>(ituple)][R_Mid + std::get<2>(ituple)][std::get<0>(jtuple)][R_Mid + std::get<1>(jtuple)][R_Mid + std::get<2>(jtuple)] - &oneArrayKPP[0], MaxWeight() >> (distance+2));
 						}
 						Square ito_tmp = ito;

diff --git a/src/thread.cpp b/src/thread.cpp
@@ -110,9 +110,6 @@ void ThreadPool::exit() {
 		deleteThread(elem);
 }
 
-ThreadPool::~ThreadPool() {
-}
-
 void ThreadPool::readUSIOptions(Searcher* s) {
 	maxThreadsPerSplitPoint_ = s->options["Max_Threads_per_Split_Point"];
 	const size_t requested   = s->options["Threads"];