lcio/sio/include
diff -u -r1.2 -r1.3
--- SIO_stream.h 11 May 2005 00:40:44 -0000 1.2
+++ SIO_stream.h 29 Nov 2005 19:55:33 -0000 1.3
@@ -1,5 +1,5 @@
// ----------------------------------------------------------------------------
-// CVS $Id: SIO_stream.h,v 1.2 2005/05/11 00:40:44 tonyj Exp $
+// CVS $Id: SIO_stream.h,v 1.3 2005/11/29 19:55:33 jeremy Exp $
// ----------------------------------------------------------------------------
// => Controller for a single SIO stream.
// ----------------------------------------------------------------------------
@@ -21,6 +21,10 @@
#include "SIO_definitions.h"
#include "SIO_functions.h"
+#ifdef __APPLE__
+#include "SIO_record.h"
+#endif
+
typedef std::map< void*, void* > pointedAtMap_c;
typedef std::map< void*, void* >::iterator pointedAtMap_i;
lcio/src/cpp/include/UTIL
diff -u -r1.4 -r1.5
--- LCFourVector.h 22 Apr 2005 15:44:29 -0000 1.4
+++ LCFourVector.h 29 Nov 2005 19:55:34 -0000 1.5
@@ -75,7 +75,7 @@
}; // class
-}; // namespace UTIL
+} // namespace UTIL
#include "UTIL/LCFourVector.icc"
lcio/src/cpp/include/UTIL
diff -u -r1.5 -r1.6
--- LCFourVector.icc 22 Sep 2005 12:28:09 -0000 1.5
+++ LCFourVector.icc 29 Nov 2005 19:55:34 -0000 1.6
@@ -69,5 +69,5 @@
setE( _lcObj->getEnergy() ) ;
}
-} ; // end namespace
+} // end namespace
#endif
lcio/src/cpp/src/UTIL
diff -u -r1.2 -r1.3
--- GNUmakefile 14 May 2004 16:00:50 -0000 1.2
+++ GNUmakefile 29 Nov 2005 19:55:34 -0000 1.3
@@ -23,7 +23,7 @@
CPPFLAGS = $(LCIOCPPFLAGS) $(INCLUDE)
ifdef CLHEP
- CPPFLAGS += -DCLHEP -I$(CLHEP)/include
+ CPPFLAGS += -DCLHEP=CLHEP -I$(CLHEP)/include
endif
objects := $(patsubst %.cc,%.o,$(wildcard *.cc))
