PCH cleanup

- src/component_pch.hh -> src/component/pch.hh, normal inclusion as if no PCH - PCH removed for ozCore, added for ozEngine
ducakar · Feb 17, 2013 · d17c6ec · d17c6ec
1 parent fcc7183
commit d17c6ec
Show file tree

Hide file tree

Showing 76 changed files with 250 additions and 90 deletions.
diff --git a/src/builder/Context.cc b/src/builder/Context.cc
@@ -30,7 +30,6 @@
 #include <client/MD2Imago.hh>
 #include <client/MD2WeaponImago.hh>
 #include <client/MD3Imago.hh>
-
 #include <client/BasicAudio.hh>
 #include <client/BotAudio.hh>
 #include <client/VehicleAudio.hh>

diff --git a/src/builder/MD2.cc b/src/builder/MD2.cc
@@ -26,7 +26,6 @@
 
 #include <client/MD2.hh>
 #include <client/Context.hh>
-
 #include <builder/Compiler.hh>
 
 namespace oz

diff --git a/src/builder/MD3.cc b/src/builder/MD3.cc
@@ -25,7 +25,6 @@
 #include <builder/MD3.hh>
 
 #include <client/Context.hh>
-
 #include <builder/Compiler.hh>
 
 namespace oz

diff --git a/src/builder/UI.cc b/src/builder/UI.cc
@@ -25,7 +25,6 @@
 #include <builder/UI.hh>
 
 #include <client/ui/Mouse.hh>
-
 #include <builder/Context.hh>
 
 namespace oz

diff --git a/src/client/Audio.hh b/src/client/Audio.hh
@@ -26,7 +26,6 @@
 #pragma once
 
 #include <matrix/Vehicle.hh>
-
 #include <client/common.hh>
 
 namespace oz

diff --git a/src/client/BSP.cc b/src/client/BSP.cc
@@ -25,8 +25,8 @@
 #include <client/BSP.hh>
 
 #include <client/Context.hh>
+#include <client/SMM.hh>
 #include <client/OpenGL.hh>
-#include "SMM.hh"
 
 namespace oz
 {

diff --git a/src/client/Camera.hh b/src/client/Camera.hh
@@ -24,7 +24,6 @@
 #pragma once
 
 #include <matrix/Vehicle.hh>
-
 #include <client/StrategicProxy.hh>
 #include <client/UnitProxy.hh>
 #include <client/CinematicProxy.hh>

diff --git a/src/client/Lua.hh b/src/client/Lua.hh
@@ -26,7 +26,6 @@
 #pragma once
 
 #include <common/Lua.hh>
-
 #include <client/common.hh>
 
 namespace oz

diff --git a/src/client/Render.cc b/src/client/Render.cc
@@ -788,8 +788,8 @@ Render render;
  */
 
 #include <ozDynamics/ozDynamics.hh>
-#include "Input.hh"
 #include <common/Timer.hh>
+#include <client/Input.hh>
 
 namespace oz
 {

diff --git a/src/client/Window.cc b/src/client/Window.cc
@@ -23,6 +23,7 @@
 
 #include <stable.hh>
 #include <client/Window.hh>
+
 #include <client/Input.hh>
 #include <client/OpenGL.hh>
 #include <client/NaClPlatform.hh>

diff --git a/src/client/ui/BuildMenu.cc b/src/client/ui/BuildMenu.cc
@@ -26,9 +26,7 @@
 
 #include <matrix/Liber.hh>
 #include <matrix/Synapse.hh>
-
 #include <nirvana/Nirvana.hh>
-
 #include <client/Camera.hh>
 
 namespace oz

diff --git a/src/client/ui/CreditsMenu.cc b/src/client/ui/CreditsMenu.cc
@@ -30,7 +30,6 @@
 #include <client/Input.hh>
 #include <client/OpenGL.hh>
 #include <client/NaClPlatform.hh>
-
 #include <client/ui/Style.hh>
 #include <client/ui/Button.hh>
 

diff --git a/src/client/ui/DebugFrame.cc b/src/client/ui/DebugFrame.cc
@@ -25,9 +25,7 @@
 #include <client/ui/DebugFrame.hh>
 
 #include <matrix/Collider.hh>
-
 #include <client/Camera.hh>
-
 #include <client/ui/Style.hh>
 
 namespace oz

diff --git a/src/client/ui/GalileoFrame.cc b/src/client/ui/GalileoFrame.cc
@@ -29,7 +29,6 @@
 #include <client/Context.hh>
 #include <client/QuestList.hh>
 #include <client/OpenGL.hh>
-
 #include <client/ui/Style.hh>
 
 namespace oz

diff --git a/src/client/ui/Label.cc b/src/client/ui/Label.cc
@@ -27,7 +27,6 @@
 #include <client/Shader.hh>
 #include <client/Shape.hh>
 #include <client/OpenGL.hh>
-
 #include <client/ui/Area.hh>
 #include <client/ui/Style.hh>
 

diff --git a/src/client/ui/LoadingArea.cc b/src/client/ui/LoadingArea.cc
@@ -26,7 +26,6 @@
 
 #include <client/Shape.hh>
 #include <client/Camera.hh>
-
 #include <client/ui/Style.hh>
 
 namespace oz

diff --git a/src/client/ui/MainMenu.cc b/src/client/ui/MainMenu.cc
@@ -30,7 +30,6 @@
 #include <client/MenuStage.hh>
 #include <client/OpenGL.hh>
 #include <client/BuildInfo.hh>
-
 #include <client/ui/Style.hh>
 #include <client/ui/MissionMenu.hh>
 #include <client/ui/SettingsFrame.hh>

diff --git a/src/client/ui/MissionMenu.cc b/src/client/ui/MissionMenu.cc
@@ -31,7 +31,6 @@
 #include <client/Input.hh>
 #include <client/OpenGL.hh>
 #include <client/NaClPlatform.hh>
-
 #include <client/ui/Style.hh>
 
 namespace oz

diff --git a/src/client/ui/Mouse.cc b/src/client/ui/Mouse.cc
@@ -30,7 +30,6 @@
 #include <client/Window.hh>
 #include <client/Input.hh>
 #include <client/OpenGL.hh>
-
 #include <client/ui/Area.hh>
 
 namespace oz

diff --git a/src/client/ui/QuestFrame.cc b/src/client/ui/QuestFrame.cc
@@ -25,7 +25,6 @@
 #include <client/ui/QuestFrame.hh>
 
 #include <client/Camera.hh>
-
 #include <client/ui/Style.hh>
 
 namespace oz

diff --git a/src/client/ui/SettingsFrame.cc b/src/client/ui/SettingsFrame.cc
@@ -27,7 +27,6 @@
 #include <client/Shape.hh>
 #include <client/Camera.hh>
 #include <client/OpenGL.hh>
-
 #include <client/ui/Style.hh>
 #include <client/ui/MainMenu.hh>
 #include <client/ui/UI.hh>

diff --git a/src/client/ui/Text.cc b/src/client/ui/Text.cc
@@ -27,7 +27,6 @@
 #include <client/Shader.hh>
 #include <client/Shape.hh>
 #include <client/OpenGL.hh>
-
 #include <client/ui/Style.hh>
 #include <client/ui/Area.hh>
 

diff --git a/src/modules/flora/FloraModule.cc b/src/modules/flora/FloraModule.cc
@@ -24,20 +24,18 @@
 #include <stable.hh>
 #include <modules/flora/FloraModule.hh>
 
+#include <common/luabase.hh>
 #include <matrix/Liber.hh>
 #include <matrix/Synapse.hh>
-
 #include <client/Lua.hh>
 
-#include <common/luabase.hh>
-
-using namespace oz::client;
-
 namespace oz
 {
 namespace modules
 {
 
+using oz::client::lua;
+
 // plants/m2
 const float FloraModule::DENSITY    = 0.04f;
 // dim * SPACING

diff --git a/src/nirvana/Mind.hh b/src/nirvana/Mind.hh
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <nirvana/common.hh>
+#include <nirvana/Task.hh>
 
 namespace oz
 {

diff --git a/src/ozCore/Alloc.cc b/src/ozCore/Alloc.cc
@@ -24,7 +24,10 @@
  * @file ozCore/Alloc.cc
  */
 
-#include "ozCore.hh"
+#include "Alloc.hh"
+
+#include "System.hh"
+#include "Log.hh"
 
 #include <cstdlib>
 #include <malloc.h>

diff --git a/src/ozCore/Buffer.cc b/src/ozCore/Buffer.cc
@@ -24,7 +24,7 @@
  * @file ozCore/Buffer.cc
  */
 
-#include "ozCore.hh"
+#include "Buffer.hh"
 
 namespace oz
 {

diff --git a/src/ozCore/CMakeLists.txt b/src/ozCore/CMakeLists.txt
@@ -90,9 +90,6 @@ endif()
 
 set_target_properties( ozCore PROPERTIES VERSION ${OZ_VERSION} SOVERSION 0 )
 
-add_pch( ozCore_pch ../ozCore_pch.hh ../ozCore_pch.cc )
-use_pch( ozCore ozCore_pch )
-
 install( TARGETS ozCore
          RUNTIME DESTINATION bin${OZ_BINARY_SUBDIR}
          LIBRARY DESTINATION lib${OZ_BINARY_SUBDIR}

diff --git a/src/ozCore/File.cc b/src/ozCore/File.cc
@@ -24,7 +24,7 @@
  * @file ozCore/File.cc
  */
 
-#include "ozCore.hh"
+#include "File.hh"
 
 #if defined( __native_client__ )
 # include <ppapi/c/pp_file_info.h>

diff --git a/src/ozCore/Gettext.cc b/src/ozCore/Gettext.cc
@@ -24,7 +24,7 @@
  * @file ozCore/Gettext.cc
  */
 
-#include "ozCore.hh"
+#include "Gettext.hh"
 
 namespace oz
 {
@@ -199,7 +199,7 @@ bool Gettext::import( const File& file )
   delete[] table;
 
   table = new Message*[nMessages];
-  aFill<Message*>( table, nullptr, nMessages );
+  aFill<Message*, Message*>( table, nullptr, nMessages );
 
   for( int i = 0; i < nMessages; ++i ) {
     uint index = uint( hash( messages[i].original ) ) % uint( nMessages );

diff --git a/src/ozCore/JSON.cc b/src/ozCore/JSON.cc
@@ -24,7 +24,13 @@
  * @file ozCore/JSON.cc
  */
 
-#include "ozCore.hh"
+#include "JSON.hh"
+
+#include "List.hh"
+#include "SList.hh"
+#include "Map.hh"
+#include "System.hh"
+#include "Log.hh"
 
 #include <cstring>
 

diff --git a/src/ozCore/Log.cc b/src/ozCore/Log.cc
@@ -24,7 +24,7 @@
  * @file ozCore/Log.cc
  */
 
-#include "ozCore.hh"
+#include "Log.hh"
 
 #include <cstdio>
 #include <cstdlib>

diff --git a/src/ozCore/Mat33.cc b/src/ozCore/Mat33.cc
@@ -24,7 +24,7 @@
  * @file ozCore/Mat33.cc
  */
 
-#include "ozCore.hh"
+#include "Mat33.hh"
 
 namespace oz
 {

diff --git a/src/ozCore/Mat44.cc b/src/ozCore/Mat44.cc
@@ -24,7 +24,7 @@
  * @file ozCore/Mat44.cc
  */
 
-#include "ozCore.hh"
+#include "Mat44.hh"
 
 namespace oz
 {

diff --git a/src/ozCore/Math.cc b/src/ozCore/Math.cc
@@ -24,7 +24,7 @@
  * @file ozCore/Math.cc
  */
 
-#include "ozCore.hh"
+#include "Math.hh"
 
 #include <cstdlib>
 

diff --git a/src/ozCore/Math.hh b/src/ozCore/Math.hh
@@ -288,7 +288,7 @@ class Math
     static void sincos( float x, float* s, float* c )
     {
       // No need to use sincosf(). GCC optimises the following calls into one sincosf() call and
-      // LLVM/Clang is missing built-in for sincosf().
+      // LLVM/Clang is missing built-ins for sincosf().
       *s = __builtin_sinf( x );
       *c = __builtin_cosf( x );
     }
@@ -348,9 +348,13 @@ class Math
     OZ_ALWAYS_INLINE
     static bool isFinite( float x )
     {
-      // isfinite() is broken in GCC with -ffinite-math-only (implied by -ffast-math).
-      // Furthermore, this expression is faster.
+      // isfinite() is broken and NaN = NaN in GCC with -ffinite-math-only (implied by -ffast-math).
+      // Furthermore, those expressions are faster than __builtin_isfinite().
+#if defined( OZ_GCC ) && defined( __FINITE_MATH_ONLY__ )
       return x + 1.0e38f != x && x == x;
+#else
+      return x + 1.0e38f != x;
+#endif
     }
 
     /**
@@ -359,9 +363,13 @@ class Math
     OZ_ALWAYS_INLINE
     static bool isInf( float x )
     {
-      // isinf() is broken in GCC with -ffinite-math-only (implied by -ffast-math).
-      // Furthermore, this expression is faster.
+      // isinf() is broken and NaN = NaN in GCC with -ffinite-math-only (implied by -ffast-math).
+      // Furthermore, those expressions are faster than __builtin_isinf().
+#if defined( OZ_GCC ) && defined( __FINITE_MATH_ONLY__ )
       return x + 1.0e38f == x && x * 0.0f != x;
+#else
+      return x + 1.0e38f == x;
+#endif
     }
 
     /**
@@ -370,9 +378,13 @@ class Math
     OZ_ALWAYS_INLINE
     static bool isNaN( float x )
     {
-      // isnan() is broken in GCC with -ffinite-math-only (implied by -ffast-math).
-      // Furthermore, this expression is faster.
-      return ( x + 1.0e38f == x && x * 0.0f == x ) || x != x;
+      // isnan() is broken and NaN = NaN in GCC with -ffinite-math-only (implied by -ffast-math).
+      // Furthermore, those expressions are faster than __builtin_isnan().
+#if defined( OZ_GCC ) && defined( __FINITE_MATH_ONLY__ )
+      return x + 1.0e38f == x && x * 0.0f == x;
+#else
+      return x != x;
+#endif
     }
 
     /**

diff --git a/src/ozCore/Mutex.cc b/src/ozCore/Mutex.cc
@@ -24,7 +24,9 @@
  * @file ozCore/Mutex.cc
  */
 
-#include "ozCore.hh"
+#include "Mutex.hh"
+
+#include "System.hh"
 
 #include <cstdlib>