Undo previous hack for std::exception conflict in dictionary file with solaris...

Undo previous hack for std::exception conflict in dictionary file with solaris cc and attempt a new one: put the exception define into eve/src/SolarisCCDictHack.h and put it just in front of LinkDef.h on the rootcint command line.


git-svn-id: http://root.cern.ch/svn/root/trunk@21077 27541ba8-7e3a-0410-8455-c3a389f83636

eve/Module.mk

@@ -45,7 +45,7 @@ $(EVELIB):      $(EVEO) $(EVEDO) $(ORDER_) $(MAINLIBS) $(EVELIBDEP)
 
 $(EVEDS):       $(EVEH) $(EVEL) $(ROOTCINTTMPEXE)
 		@echo "Generating dictionary $@..."
-		$(ROOTCINTTMP) -f $@ -c $(EVEH) $(EVEL)
+		$(ROOTCINTTMP) -f $@ -c $(EVEH) $(EVEDIRS)/SolarisCCDictHack.h $(EVEL)
 
 $(EVEMAP):      $(RLIBMAP) $(MAKEFILEDEP) $(EVEL)
 		$(RLIBMAP) -o $(EVEMAP) -l $(EVELIB) \

eve/inc/TEveUtil.h

@@ -22,14 +22,6 @@
 #include <set>
 #include <exception>
 
-#if defined(G__DICTIONARY) && defined(R__SOLARIS)
-// Force the inclusion of rw/math.h
-#include <limits>
-// Work around interaction between a struct named exception in math.h,
-// std::exception and the use of using namespace std;
-#define exception std::exception
-#endif
-
 class TVirtualPad;
 class TGeoManager;
 

eve/src/SolarisCCDictHack.h

+// @(#)root/eve:$Id$
+// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
+
+/*************************************************************************
+ * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers.               *
+ * All rights reserved.                                                  *
+ *                                                                       *
+ * For the licensing terms see $ROOTSYS/LICENSE.                         *
+ * For the list of contributors see $ROOTSYS/README/CREDITS.             *
+ *************************************************************************/
+
+// Hack proposed by Philippe.
+//
+// See also Module.mk where this file is put on rootcint's command
+// line just in front of the LinkDef.h file.
+
+#if defined(G__DICTIONARY) && defined(R__SOLARIS)
+// Force the inclusion of rw/math.h
+#include <limits>
+// Work around interaction between a struct named exception in math.h,
+// std::exception and the use of using namespace std;
+#define exception std::exception
+#endif