[Csp-commits] svn:csp r1069 - in trunk/CSP/CSPSim: . Source

[<sv...@ww...>]

Author: mkrose
Date: 2004-06-26 23:44:09 -0700 (Sat, 26 Jun 2004)
New Revision: 1069

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Source/ConsoleCommands.cpp
   trunk/CSP/CSPSim/Source/GameScreen.cpp
Log:
Fixed indentation.
Rearrange headers to suppress a warning in py_config.h.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1069

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2004-06-27 02:57:47 UTC (rev 1068)
+++ trunk/CSP/CSPSim/CHANGES.current	2004-06-27 06:44:09 UTC (rev 1069)
@@ -1,6 +1,11 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2004-06-26: onsight
+  * Fixed indentation.
+
+  * Rearrange headers to suppress a warning in py_config.h.
+
 2004-06-20: onsight
   * Changed doxygen control file to recurse into the variou subdirectories
     (Systems, Theater, etc).

Modified: trunk/CSP/CSPSim/Source/ConsoleCommands.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ConsoleCommands.cpp	2004-06-27 02:57:47 UTC (rev 1068)
+++ trunk/CSP/CSPSim/Source/ConsoleCommands.cpp	2004-06-27 06:44:09 UTC (rev 1069)
@@ -23,6 +23,16 @@
  **/
 
 
+// python ends up defining _POSIX_C_SOURCE, without testing if it has
+// previously been defined.  ConsoleCommands.h ultimately includes stl
+// headers than bring in features.h, which also define this constant,
+// but are more careful about overriding previous definitions.  So
+// although we generally put the header file associated with a cpp
+// file first in the includes list, moving Python.h to the front of
+// the list serves to suppress this warning (and the dozen or so lines
+// of diagnostic output that g++ emits).
+#include <Python.h>
+
 #include "ConsoleCommands.h"
 #include "Console.h"
 #include "Shell.h"

Modified: trunk/CSP/CSPSim/Source/GameScreen.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/GameScreen.cpp	2004-06-27 02:57:47 UTC (rev 1068)
+++ trunk/CSP/CSPSim/Source/GameScreen.cpp	2004-06-27 06:44:09 UTC (rev 1069)
@@ -206,10 +206,10 @@
 	m_ActiveObject(0),
 	m_CameraAgent(ViewFactory()),
 	m_CurrentCameraCommand(0) {
-		initInterface();
-		createCameraCommand();
+	initInterface();
+	createCameraCommand();
 }
-	
+
 GameScreen::~GameScreen() {
 	deleteCameraCommands();
 }