[Gzz-commits] libvob include/vob/jni/Types.hxx include/vob/vo...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/04 03:57:56

Modified files:
        include/vob/jni: Types.hxx 
        include/vob/vobs: Paper.hxx 
        src/jni        : Image.cxx TexAccum.cxx 

Log message:
        Faster C++ compilation through declarations and omissions of includes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/jni/Types.hxx.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/vobs/Paper.hxx.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Image.cxx.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/TexAccum.cxx.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: libvob/include/vob/jni/Types.hxx
diff -u libvob/include/vob/jni/Types.hxx:1.27 
libvob/include/vob/jni/Types.hxx:1.28
--- libvob/include/vob/jni/Types.hxx:1.27       Sat Aug  2 05:07:10 2003
+++ libvob/include/vob/jni/Types.hxx    Mon Aug  4 03:57:56 2003
@@ -35,21 +35,42 @@
 #include <vob/util/ObjectStorer.hxx>
 #include <vob/Debug.hxx>
 
-#include <vob/jni/Strings.hxx>
-#include <vob/paper/Paper.hxx>
-#include <vob/util/ImageLoader.hxx>
 #include <vob/jni/Stats.hxx>
+#include <vob/jni/Strings.hxx>
 
 
 
+namespace GLMosaicText {
+    namespace Mosaic {
+       template<class Format> class GLMosaicText::Mosaic::Raster;
+    }
+}
+
 namespace Vob {
+    // Predeclarations, to avoid including
+    // too many files here, since this file is
+    // included *everywhere*.
     namespace Os {
        class RenderingSurface;
     }
+    namespace Paper {
+       class Paper;
+    }
     namespace Primitives {
     }
     namespace Vobs {
     }
+    namespace ImageLoader {
+       typedef GLMosaicText::Mosaic::Raster<GLMosaicText::Mosaic::Format::RGBA>
+                   RGBARaster;
+    }
+    namespace Stats {
+       struct TexAccum;
+    }
+    namespace JNI {
+       struct TexAccum_JNI;
+    }
+
 namespace JNI {
     PREDBGVAR(dbg);
     PREDBGVAR(dbg_convert);
@@ -76,7 +97,8 @@
 
     extern ObjectStorer<ImageLoader::RGBARaster> images;
 
-    extern ObjectStorer<TexAccum_JNI> texaccums;
+    // Only TexAccum_JNI objects will be stored here
+    extern ObjectStorer<Stats::TexAccum> texaccums;
 
 
     typedef ::Vob::Paper::Paper P; // g++3.2 doesn't like ::... inside
Index: libvob/include/vob/vobs/Paper.hxx
diff -u libvob/include/vob/vobs/Paper.hxx:1.16 
libvob/include/vob/vobs/Paper.hxx:1.17
--- libvob/include/vob/vobs/Paper.hxx:1.16      Sun Jul 13 15:04:26 2003
+++ libvob/include/vob/vobs/Paper.hxx   Mon Aug  4 03:57:56 2003
@@ -47,6 +47,8 @@
 
 #include <vob/poly/Dicer.hxx>
 
+#include <vob/stats/TexAccum.hxx>
+
 namespace Vob {
 namespace Vobs {
 
Index: libvob/src/jni/Image.cxx
diff -u libvob/src/jni/Image.cxx:1.1 libvob/src/jni/Image.cxx:1.2
--- libvob/src/jni/Image.cxx:1.1        Tue Apr 15 09:54:20 2003
+++ libvob/src/jni/Image.cxx    Mon Aug  4 03:57:56 2003
@@ -33,6 +33,8 @@
 #include <vob/buildmipmaps.hxx>
 #include <vob/Debug.hxx>
 
+#include <vob/util/ImageLoader.hxx>
+
 #include "org_nongnu_libvob_gl_GL.h"
 #include "vobjnidef.hxx"
 
Index: libvob/src/jni/TexAccum.cxx
diff -u libvob/src/jni/TexAccum.cxx:1.4 libvob/src/jni/TexAccum.cxx:1.5
--- libvob/src/jni/TexAccum.cxx:1.4     Mon Jun 23 10:53:19 2003
+++ libvob/src/jni/TexAccum.cxx Mon Aug  4 03:57:56 2003
@@ -53,7 +53,7 @@
 
 Stats::Statistics statistics;
 
-ObjectStorer<TexAccum_JNI> texaccums("texaccums");
+ObjectStorer<Stats::TexAccum> texaccums("texaccums");
 
 jclass globalclass_WeakStatsCaller = 0;
 jmethodID WSC_call = 0;
@@ -105,7 +105,8 @@
 
 jf( void, impl_1TexAccum_1delete )
        (JNIEnv *env, jclass, jint id) {
-    TexAccum_JNI *accum = texaccums.get(id);
+    // We know only TexAccum_JNIs get into texaccums
+    TexAccum_JNI *accum = (TexAccum_JNI *)texaccums.get(id);
     accum->prepareToDelete(env);
     texaccums.remove(id);
 }