LISTSERV 16.5 - LCDET-SVN Archives

Commit in `projects/gdml/trunk/G4Binding/G4Subscribers/src` on MAIN
`LibLoadSubscribers.cpp`	-25	3097 -> 3098
`ellipsoidSubscriber.cpp`	-4	3097 -> 3098
`tessellatedSubscriber.cpp`	-5	3097 -> 3098
`tetSubscriber.cpp`	-5	3097 -> 3098
`twistedboxSubscriber.cpp`	-7	3097 -> 3098
`twistedtrapSubscriber.cpp`	-8	3097 -> 3098
`twistedtrdSubscriber.cpp`	-7	3097 -> 3098
`twistedtubsSubscriber.cpp`	-6	3097 -> 3098
`xtruSubscriber.cpp`	-4	3097 -> 3098
	-71

9 modified files

Remove all include guards on subscriber classes to fix bug where tesselated subscriber was not loaded.

projects/gdml/trunk/G4Binding/G4Subscribers/src

LibLoadSubscribers.cpp 3097 -> 3098

--- projects/gdml/trunk/G4Binding/G4Subscribers/src/LibLoadSubscribers.cpp	2014-04-16 06:34:38 UTC (rev 3097)
+++ projects/gdml/trunk/G4Binding/G4Subscribers/src/LibLoadSubscribers.cpp	2014-04-18 22:20:19 UTC (rev 3098)
@@ -30,37 +30,12 @@

     LOAD_COMPONENT(bordersurfaceSubscriber)
     LOAD_COMPONENT(loopSubscriber)

-// Following subscribers are only enabled if the Geant4 version supports them.
-
-#ifdef HAVE_G4EXTRUDEDSOLID

     LOAD_COMPONENT(xtruSubscriber)

-#endif
-
-#ifdef HAVE_G4ELLIPSOID

     LOAD_COMPONENT(ellipsoidSubscriber)

-#endif
-
-#ifdef HAVE_G4TESSELLATEDSOLID

     LOAD_COMPONENT(tessellatedSubscriber)

-#endif
-
-#ifdef HAVE_G4TET

     LOAD_COMPONENT(tetSubscriber)

-#endif
-
-#ifdef HAVE_G4TWISTEDBOX

     LOAD_COMPONENT(twistedboxSubscriber)

-#endif
-
-#ifdef HAVE_G4TWISTEDTUBS

     LOAD_COMPONENT(twistedtubsSubscriber)

-#endif
-
-#ifdef HAVE_G4TWISTEDTRAP

     LOAD_COMPONENT(twistedtrapSubscriber)

-#endif
-
-#ifdef HAVE_G4TWISTEDTRD

     LOAD_COMPONENT(twistedtrdSubscriber)

-#endif

projects/gdml/trunk/G4Binding/G4Subscribers/src

ellipsoidSubscriber.cpp 3097 -> 3098

--- projects/gdml/trunk/G4Binding/G4Subscribers/src/ellipsoidSubscriber.cpp	2014-04-16 06:34:38 UTC (rev 3097)
+++ projects/gdml/trunk/G4Binding/G4Subscribers/src/ellipsoidSubscriber.cpp	2014-04-18 22:20:19 UTC (rev 3098)
@@ -1,5 +1,3 @@

-#ifdef HAVE_G4ELLIPSOID
-

 // --------------------------------------------------------------
 // Comments
 //                G.GUERRIERI - 26.06.2005

@@ -78,5 +76,3 @@

 };
 
 DECLARE_SUBSCRIBER_FACTORY(ellipsoidSubscriber)

-
-#endif

projects/gdml/trunk/G4Binding/G4Subscribers/src

tessellatedSubscriber.cpp 3097 -> 3098

--- projects/gdml/trunk/G4Binding/G4Subscribers/src/tessellatedSubscriber.cpp	2014-04-16 06:34:38 UTC (rev 3097)
+++ projects/gdml/trunk/G4Binding/G4Subscribers/src/tessellatedSubscriber.cpp	2014-04-18 22:20:19 UTC (rev 3098)
@@ -1,7 +1,5 @@

//

-#ifdef HAVE_G4TESSELLATEDSOLID
-

 #include "Saxana/SAXSubscriber.h"
 #include "Saxana/SAXComponentFactory.h"

@@ -145,6 +143,3 @@

 };
 
 DECLARE_SUBSCRIBER_FACTORY(tessellatedSubscriber)

-
-#endif
-

projects/gdml/trunk/G4Binding/G4Subscribers/src

tetSubscriber.cpp 3097 -> 3098

--- projects/gdml/trunk/G4Binding/G4Subscribers/src/tetSubscriber.cpp	2014-04-16 06:34:38 UTC (rev 3097)
+++ projects/gdml/trunk/G4Binding/G4Subscribers/src/tetSubscriber.cpp	2014-04-18 22:20:19 UTC (rev 3098)
@@ -1,6 +1,4 @@

//

-#ifdef HAVE_G4TET
-

 #include "Saxana/SAXSubscriber.h"
 #include "Saxana/SAXComponentFactory.h"

@@ -57,6 +55,3 @@

 
 DECLARE_SUBSCRIBER_FACTORY(tetSubscriber)

-#endif
-
-

projects/gdml/trunk/G4Binding/G4Subscribers/src

twistedboxSubscriber.cpp 3097 -> 3098

--- projects/gdml/trunk/G4Binding/G4Subscribers/src/twistedboxSubscriber.cpp	2014-04-16 06:34:38 UTC (rev 3097)
+++ projects/gdml/trunk/G4Binding/G4Subscribers/src/twistedboxSubscriber.cpp	2014-04-18 22:20:19 UTC (rev 3098)
@@ -1,6 +1,3 @@

-#ifdef HAVE_G4TWISTEDBOX
-
-//

 #include "Saxana/SAXSubscriber.h"
 #include "Saxana/SAXComponentFactory.h"

@@ -76,7 +73,3 @@

 
 DECLARE_SUBSCRIBER_FACTORY(twistedboxSubscriber)

-#endif
-
-
-

projects/gdml/trunk/G4Binding/G4Subscribers/src

twistedtrapSubscriber.cpp 3097 -> 3098

--- projects/gdml/trunk/G4Binding/G4Subscribers/src/twistedtrapSubscriber.cpp	2014-04-16 06:34:38 UTC (rev 3097)
+++ projects/gdml/trunk/G4Binding/G4Subscribers/src/twistedtrapSubscriber.cpp	2014-04-18 22:20:19 UTC (rev 3098)
@@ -1,6 +1,3 @@

-#ifdef HAVE_G4TWISTEDTRAP
-
-//

 #include "Saxana/SAXSubscriber.h"
 #include "Saxana/SAXComponentFactory.h"

@@ -110,8 +107,3 @@

 };
 
 DECLARE_SUBSCRIBER_FACTORY(twistedtrapSubscriber)

-
-#endif
-
-
-

projects/gdml/trunk/G4Binding/G4Subscribers/src

twistedtrdSubscriber.cpp 3097 -> 3098

--- projects/gdml/trunk/G4Binding/G4Subscribers/src/twistedtrdSubscriber.cpp	2014-04-16 06:34:38 UTC (rev 3097)
+++ projects/gdml/trunk/G4Binding/G4Subscribers/src/twistedtrdSubscriber.cpp	2014-04-18 22:20:19 UTC (rev 3098)
@@ -1,5 +1,3 @@

-#ifdef HAVE_G4TWISTEDTRD
-

 //
 #include "Saxana/SAXSubscriber.h"
 #include "Saxana/SAXComponentFactory.h"

@@ -85,8 +83,3 @@

 };
 
 DECLARE_SUBSCRIBER_FACTORY(twistedtrdSubscriber)

-
-#endif
-
-
-

projects/gdml/trunk/G4Binding/G4Subscribers/src

twistedtubsSubscriber.cpp 3097 -> 3098

--- projects/gdml/trunk/G4Binding/G4Subscribers/src/twistedtubsSubscriber.cpp	2014-04-16 06:34:38 UTC (rev 3097)
+++ projects/gdml/trunk/G4Binding/G4Subscribers/src/twistedtubsSubscriber.cpp	2014-04-18 22:20:19 UTC (rev 3098)
@@ -1,5 +1,3 @@

-#ifdef HAVE_G4TWISTEDTUBS
-

 //
 #include "Saxana/SAXSubscriber.h"
 #include "Saxana/SAXComponentFactory.h"

@@ -76,7 +74,3 @@

 };
 
 DECLARE_SUBSCRIBER_FACTORY(twistedtubsSubscriber)

-
-#endif
-
-

projects/gdml/trunk/G4Binding/G4Subscribers/src

xtruSubscriber.cpp 3097 -> 3098

--- projects/gdml/trunk/G4Binding/G4Subscribers/src/xtruSubscriber.cpp	2014-04-16 06:34:38 UTC (rev 3097)
+++ projects/gdml/trunk/G4Binding/G4Subscribers/src/xtruSubscriber.cpp	2014-04-18 22:20:19 UTC (rev 3098)
@@ -1,5 +1,3 @@

-#ifdef HAVE_G4EXTRUDEDSOLID
-

 #include "Saxana/SAXSubscriber.h"
 #include "Saxana/SAXComponentFactory.h"

@@ -98,5 +96,3 @@

 };
 
 DECLARE_SUBSCRIBER_FACTORY(xtruSubscriber)

-
-#endif

SVNspam 0.1

Use REPLY-ALL to reply to list

To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1