X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc.h;h=92bde8f00618f9a70b7871dd958c69b759182693;hb=5413fda7397f8ffe32e41b9c7f13297c39929f5c;hp=9650f06eb3c88a2623e9824ca48e569ed8ece46f;hpb=b50ce5ebfbc9f8b043f0d915c47b0ac550d4affc;p=stockfish
diff --git a/src/misc.h b/src/misc.h
index 9650f06e..92bde8f0 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined(MISC_H_INCLUDED)
+#ifndef MISC_H_INCLUDED
#define MISC_H_INCLUDED
#include
@@ -27,7 +27,6 @@
#include "types.h"
extern const std::string engine_info(bool to_uci = false);
-extern int cpu_count();
extern void timed_wait(WaitCondition&, Lock&, int);
extern void prefetch(char* addr);
extern void start_logger(bool b);
@@ -46,24 +45,24 @@ struct Log : public std::ofstream {
namespace Time {
typedef int64_t point;
- point now();
+ inline point now() { return system_time_to_msec(); }
}
template
struct HashTable {
- HashTable() : e(Size, Entry()) {}
- Entry* operator[](Key k) { return &e[(uint32_t)k & (Size - 1)]; }
+ HashTable() : table(Size, Entry()) {}
+ Entry* operator[](Key k) { return &table[(uint32_t)k & (Size - 1)]; }
private:
- std::vector e;
+ std::vector table;
};
-enum SyncCout { io_lock, io_unlock };
+enum SyncCout { IO_LOCK, IO_UNLOCK };
std::ostream& operator<<(std::ostream&, SyncCout);
-#define sync_cout std::cout << io_lock
-#define sync_endl std::endl << io_unlock
+#define sync_cout std::cout << IO_LOCK
+#define sync_endl std::endl << IO_UNLOCK
-#endif // !defined(MISC_H_INCLUDED)
+#endif // #ifndef MISC_H_INCLUDED