Do not workaround function argument evaluation

[stockfish] / src / ucioption.h

diff --git a/src/ucioption.h b/src/ucioption.h
index efdfce6607141be39c4e97950cd5354d6534db8c..75e4ac1301e6d85e2b7daf8bb451bfeeb670a20e 100644 (file)
--- a/src/ucioption.h
+++ b/src/ucioption.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)

-  Copyright (C) 2008-2013 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
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by


@@ -38,15 +38,16 @@ typedef std::map<std::string, Option, CaseInsensitiveLess> OptionsMap;
 /// Option class implements an option as defined by UCI protocol
 class Option {
 
 /// Option class implements an option as defined by UCI protocol
 class Option {
 

-  typedef void (Fn)(const Option&);
+  typedef void (*OnChange)(const Option&);

 
 public:
 
 public:

-  Option(Fn* = NULL);
-  Option(bool v, Fn* = NULL);
-  Option(const char* v, Fn* = NULL);
-  Option(int v, int min, int max, Fn* = NULL);
+  Option(OnChange = NULL);
+  Option(bool v, OnChange = NULL);
+  Option(const char* v, OnChange = NULL);
+  Option(int v, int min, int max, OnChange = NULL);

 
   Option& operator=(const std::string& v);
 
   Option& operator=(const std::string& v);

+  Option& operator<<(const Option& o);

   operator int() const;
   operator std::string() const;
 
   operator int() const;
   operator std::string() const;
 


@@ -56,7 +57,7 @@ private:
   std::string defaultValue, currentValue, type;
   int min, max;
   size_t idx;
   std::string defaultValue, currentValue, type;
   int min, max;
   size_t idx;

-  Fn* on_change;
+  OnChange on_change;

 };
 
 void init(OptionsMap&);
 };
 
 void init(OptionsMap&);