Remove some the old children library as well as old time code, replac…

…e #ifndefs with #pragma once to avoid collisions on Macs, spinlocks aren't needed in single threaded mode

assert2.h

@@ -1,6 +1,5 @@
 
-#ifndef _ASSERT2_H_
-#define _ASSERT2_H_
+#pragma once
 
 #include <cassert>
 #include "string.h"
@@ -10,5 +9,3 @@
    ? __ASSERT_VOID_CAST (0)						\
    : __assert_fail ((string(__STRING(expr)) + "; " + (str)).c_str(), __FILE__, __LINE__, __ASSERT_FUNCTION))
 
-#endif
-

board.h

@@ -1,6 +1,5 @@
 
-#ifndef _BOARD_H_
-#define _BOARD_H_
+#pragma once
 
 #include <cstdio>
 #include <algorithm>
@@ -875,5 +874,3 @@ mutable uint8_t ringdepth; //when doing a ring search, what depth was this posit
 	}
 };
 
-#endif
-

compacttree.h

@@ -1,8 +1,5 @@
 
-
-
-#ifndef _COMPACTTREE_H_
-#define _COMPACTTREE_H_
+#pragma once
 
 #include <new>
 #include <cstring> //for memmove
@@ -499,5 +496,3 @@ template <class Node> class CompactTree {
 	}
 };
 
-#endif
-

depthstats.h

@@ -1,6 +1,5 @@
 
-#ifndef _DEPTHSTATS_H_
-#define _DEPTHSTATS_H_
+#pragma once
 
 #include <stdint.h>
 #include <cmath>
@@ -59,5 +58,3 @@ struct DepthStats {
 	}
 };
 
-#endif
-

game.h

@@ -1,6 +1,5 @@
 
-#ifndef _GAME_H_
-#define _GAME_H_
+#pragma once
 
 #include "board.h"
 #include "move.h"
@@ -77,5 +76,3 @@ class HavannahGame {
 	}
 };
 
-#endif
-

gtp.h

@@ -1,6 +1,5 @@
 
-#ifndef _GTP_H_
-#define _GTP_H_
+#pragma once
 
 #include "string.h"
 
@@ -26,7 +25,7 @@ struct GTPResponse {
 		response = r;
 		rtrim(response);
 	}
-	
+
 	GTPResponse(string r){
 		GTPResponse(true, r);
 	}
@@ -102,11 +101,11 @@ class GTPclient {
 		if(longest_cmd < name.length())
 			longest_cmd = name.length();
 	}
-	
+
 	void newcallback(const GTPCallback & a){
 		callbacks.push_back(a);
 	}
-	
+
 	int find_callback(const string & name){
 		for(unsigned int i = 0; i < callbacks.size(); i++)
 			if(callbacks[i].name == name)
@@ -155,7 +154,7 @@ class GTPclient {
 			string line(buf);
 
 			trim(line);
-			
+
 			if(line.length() == 0 || line[0] == '#')
 				continue;
 
@@ -211,7 +210,7 @@ class GTPclient {
 		running = false;
 		return true;
 	}
-	
+
 	GTPResponse gtp_list_commands(vecstr args, bool showdesc){
 		string ret = "\n";
 		for(unsigned int i = 0; i < callbacks.size(); i++){
@@ -226,5 +225,3 @@ class GTPclient {
 	}
 };
 
-#endif
-

hashset.h

@@ -1,6 +1,5 @@
 
-#ifndef _HASHSET_H_
-#define _HASHSET_H_
+#pragma once
 
 #include "zobrist.h"
 
@@ -32,7 +31,7 @@ class HashSet {
 			i = (i+1) & mask;
 		table[i] = h;
 	}
-	
+
 	bool exists(hash_t h){
 		for(unsigned int i = h & mask; table[i]; i = (i+1) & mask)
 			if(table[i] == h)
@@ -53,5 +52,3 @@ class HashSet {
 	}
 };
 
-#endif
-

havannahgtp.h

@@ -1,6 +1,5 @@
 
-#ifndef _HAVANNAHGTP_H_
-#define _HAVANNAHGTP_H_
+#pragma once
 
 #include "gtp.h"
 #include "game.h"
@@ -223,5 +222,3 @@ class HavannahGTP : public GTPclient {
 	GTPResponse gtp_solve_pnstt_clear(vecstr args);
 };
 
-#endif
-

lbdist.h

@@ -1,4 +1,5 @@
 
+#pragma once
 
 /*
 Compute a rough lower bound on the number of additional moves needed to win given this position
@@ -9,8 +10,6 @@ Increase distance when crossing an opponent virtual connection?
 Decrease distance when crossing your own virtual connection?
 */
 
-#ifndef _LBDIST_H_
-#define _LBDIST_H_
 
 #include "board.h"
 #include "move.h"
@@ -201,5 +200,3 @@ class LBDists {
 	}
 };
 
-#endif
-

log.h

@@ -1,6 +1,5 @@
 
-#ifndef _LOG_H_
-#define _LOG_H_
+#pragma once
 
 #include <cstdio>
 #include <string>
@@ -9,5 +8,3 @@ inline void logerr(std::string str){
 	fprintf(stderr, "%s", str.c_str());
 }
 
-#endif
-

move.h

@@ -1,6 +1,5 @@
 
-#ifndef _MOVE_H_
-#define _MOVE_H_
+#pragma once
 
 #include <stdint.h>
 #include <cstdlib>
@@ -89,5 +88,3 @@ struct PairMove {
 	PairMove(MoveSpecial A) : a(Move(A)), b(M_UNKNOWN) { }
 };
 
-#endif
-

player.h

@@ -1,6 +1,5 @@
 
-#ifndef __PLAYER_H_
-#define __PLAYER_H_
+#pragma once
 
 #include <cmath>
 #include <cassert>
@@ -438,5 +437,3 @@ class Player {
 	Node * return_move(Node * node, int toplay) const;
 };
 
-#endif
-

solver.h

@@ -1,6 +1,5 @@
 
-#ifndef _SOLVER_H_
-#define _SOLVER_H_
+#pragma once
 
 #include <stdint.h>
 #include "board.h"
@@ -65,5 +64,3 @@ class Solver {
 
 };
 
-#endif
-

solverab.h

@@ -1,6 +1,5 @@
 
-#ifndef _SOLVERAB_H_
-#define _SOLVERAB_H_
+#pragma once
 
 #include <stdint.h>
 
@@ -71,5 +70,3 @@ class SolverAB : public Solver {
 	void tt_set(const Board & board, int val);
 };
 
-#endif
-

solverpns_tt.h

@@ -1,6 +1,5 @@
 
-#ifndef _SOLVERPNS_TT_H_
-#define _SOLVERPNS_TT_H_
+#pragma once
 
 #include <stdint.h>
 
@@ -130,5 +129,3 @@ class SolverPNSTT : public Solver {
 	PNSNode * tt(const Board & board, Move move);
 };
 
-#endif
-

string.h

@@ -1,6 +1,5 @@
 
-#ifndef _STRING_H_
-#define _STRING_H_
+#pragma once
 
 #include <vector>
 #include <string>
@@ -31,5 +30,3 @@ void rtrim(std::string & str);
 vecstr explode(const std::string & str, const std::string & sep);
 std::string implode(const vecstr & vec, const std::string & sep);
 
-#endif
-

thread.h

@@ -1,8 +1,5 @@
 
-
-
-#ifndef _MY_THREAD_H_
-#define _MY_THREAD_H_
+#pragma once
 
 #include <tr1/functional>
 #include <pthread.h>
@@ -118,8 +115,13 @@ class SpinLock {
 public:
 	SpinLock() : taken(0) { }
 	void lock()   { while(!trylock()) ; }
+#ifdef SINGLE_THREAD
+	bool trylock(){ return true; }
+	void unlock() { };
+#else
 	bool trylock(){ return !__sync_lock_test_and_set(&taken, 1); }
 	void unlock() { __sync_lock_release(&taken); }
+#endif
 };
 
 //object wrapper around pthread rwlock
@@ -231,6 +233,3 @@ class Barrier {
 	}
 };
 
-
-#endif
-