[Orxonox-commit 7441] r12048 - in code/branches/wagnis_HS18/src: libraries/tools modules

[stadlero at orxonox.net]

Author: stadlero
Date: 2018-10-21 13:24:43 +0200 (Sun, 21 Oct 2018)
New Revision: 12048

Modified:
   code/branches/wagnis_HS18/src/libraries/tools/Timer.cc
   code/branches/wagnis_HS18/src/libraries/tools/Timer.h
   code/branches/wagnis_HS18/src/modules/CMakeLists.txt
Log:
Klassen WagnisProvince und WagnisGameboard hinzugefugt und in Klasse src/libraries/tools/Timer eine fehlendes #include hinzugefugt -Oli

Modified: code/branches/wagnis_HS18/src/libraries/tools/Timer.cc
===================================================================
--- code/branches/wagnis_HS18/src/libraries/tools/Timer.cc	2018-10-17 09:42:24 UTC (rev 12047)
+++ code/branches/wagnis_HS18/src/libraries/tools/Timer.cc	2018-10-21 11:24:43 UTC (rev 12048)
@@ -36,6 +36,7 @@
 #include <set>
 
 #include <boost/bimap.hpp>
+#include <functional>
 
 #include "util/Clock.h"
 #include "core/CoreIncludes.h"

Modified: code/branches/wagnis_HS18/src/libraries/tools/Timer.h
===================================================================
--- code/branches/wagnis_HS18/src/libraries/tools/Timer.h	2018-10-17 09:42:24 UTC (rev 12047)
+++ code/branches/wagnis_HS18/src/libraries/tools/Timer.h	2018-10-21 11:24:43 UTC (rev 12048)
@@ -77,6 +77,7 @@
 #define _Timer_H__
 
 #include "tools/ToolsPrereqs.h"
+#include <functional>
 
 #include "core/object/Listable.h"
 #include "core/command/ExecutorPtr.h"

Modified: code/branches/wagnis_HS18/src/modules/CMakeLists.txt
===================================================================
--- code/branches/wagnis_HS18/src/modules/CMakeLists.txt	2018-10-17 09:42:24 UTC (rev 12047)
+++ code/branches/wagnis_HS18/src/modules/CMakeLists.txt	2018-10-21 11:24:43 UTC (rev 12048)
@@ -49,3 +49,4 @@
 ADD_SUBDIRECTORY(asteroids2D)
 ADD_SUBDIRECTORY(flappyorx)
 ADD_SUBDIRECTORY(orxyroad)
+ADD_SUBDIRECTORY(wagnis)