[Orxonox-commit 2722] r7427 - in code/trunk/src/libraries: core util
rgrieder at orxonox.net
rgrieder at orxonox.net
Sun Sep 12 15:33:35 CEST 2010
Author: rgrieder
Date: 2010-09-12 15:33:35 +0200 (Sun, 12 Sep 2010)
New Revision: 7427
Modified:
code/trunk/src/libraries/core/Core.cc
code/trunk/src/libraries/core/PathConfig.h
code/trunk/src/libraries/util/Math.h
Log:
Applied fixes from sandbox_qt to trunk.
Modified: code/trunk/src/libraries/core/Core.cc
===================================================================
--- code/trunk/src/libraries/core/Core.cc 2010-09-12 13:19:43 UTC (rev 7426)
+++ code/trunk/src/libraries/core/Core.cc 2010-09-12 13:33:35 UTC (rev 7427)
@@ -36,6 +36,8 @@
#include "Core.h"
#include <cassert>
+#include <cstdlib>
+#include <ctime>
#include <fstream>
#include <vector>
Modified: code/trunk/src/libraries/core/PathConfig.h
===================================================================
--- code/trunk/src/libraries/core/PathConfig.h 2010-09-12 13:19:43 UTC (rev 7426)
+++ code/trunk/src/libraries/core/PathConfig.h 2010-09-12 13:33:35 UTC (rev 7427)
@@ -65,7 +65,7 @@
public:
/**
@brief
- Retrievs the executable path and sets all hard coded fixed paths (currently only the module path)
+ Retrieves the executable path and sets all hard coded fixed paths (currently only the module path)
Also checks for "orxonox_dev_build.keep_me" in the executable diretory.
If found it means that this is not an installed run, hence we
don't write the logs and config files to ~/.orxonox
Modified: code/trunk/src/libraries/util/Math.h
===================================================================
--- code/trunk/src/libraries/util/Math.h 2010-09-12 13:19:43 UTC (rev 7426)
+++ code/trunk/src/libraries/util/Math.h 2010-09-12 13:33:35 UTC (rev 7427)
@@ -44,6 +44,7 @@
#include <string>
#include <cmath>
+#include <cstdlib>
#include <OgreMath.h>
#include <OgreVector2.h>
More information about the Orxonox-commit
mailing list