Retire uci.h and benchmark.h

Moved the single prototipes where are needed.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index b42077b106385fee49af24c0e9a0b2a89483b403..e2f7c5a296dbf50dd306e6c501e01ebd03e3137f 100644 (file)
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -25,7 +25,6 @@
 #include <sstream>
 #include <vector>
 
 #include <sstream>
 #include <vector>
 

-#include "benchmark.h"

 #include "search.h"
 #include "thread.h"
 #include "ucioption.h"
 #include "search.h"
 #include "thread.h"
 #include "ucioption.h"

diff --git a/src/benchmark.h b/src/benchmark.h
deleted file mode 100644 (file)
index 88b016d..0000000
--- a/src/benchmark.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-  Stockfish, a UCI chess playing engine derived from Glaurung 2.1
-  Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2010 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
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Stockfish is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#if !defined(BENCHMARK_H_INCLUDED)
-#define BENCHMARK_H_INCLUDED
-
-////
-//// Includes
-////
-
-#include <string>
-
-
-////
-//// Prototypes
-////
-
-extern void benchmark(const std::string& commandLine);
-
-#endif // !defined(BENCHMARK_H_INCLUDED)

diff --git a/src/main.cpp b/src/main.cpp
index e623297c53661166f0ab64073f606abfecb779bc..372e8abc58e990442d62a32c218c5f9a03a1b577 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,10 +28,8 @@
 #include <iostream>
 #include <string>
 
 #include <iostream>
 #include <string>
 

-#include "benchmark.h"

 #include "bitcount.h"
 #include "misc.h"
 #include "bitcount.h"
 #include "misc.h"

-#include "uci.h"

 
 #ifdef USE_CALLGRIND
 #include <valgrind/callgrind.h>
 
 #ifdef USE_CALLGRIND
 #include <valgrind/callgrind.h>


@@ -39,6 +37,8 @@
 
 using namespace std;
 
 
 using namespace std;
 

+extern void uci_main_loop();
+extern void benchmark(const std::string& commandLine);

 
 ////
 //// Functions
 
 ////
 //// Functions

diff --git a/src/uci.cpp b/src/uci.cpp
index 6adaf3929b1a530f133dc501e00223856975c44b..c011171a44c1b8e7a26e83d6c92fd25ba662737f 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -34,7 +34,6 @@
 #include "position.h"
 #include "san.h"
 #include "search.h"
 #include "position.h"
 #include "san.h"
 #include "search.h"

-#include "uci.h"

 #include "ucioption.h"
 
 using namespace std;
 #include "ucioption.h"
 
 using namespace std;

diff --git a/src/uci.h b/src/uci.h
deleted file mode 100644 (file)
index f3cb417..0000000
--- a/src/uci.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-  Stockfish, a UCI chess playing engine derived from Glaurung 2.1
-  Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2010 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
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Stockfish is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#if !defined(UCI_H_INCLUDED)
-#define UCI_H_INCLUDED
-
-////
-//// Prototypes
-////
-
-extern void uci_main_loop();
-
-
-#endif // !defined(UCI_H_INCLUDED)