merging small changes from 1.9 branch

Cast/src/itos.cc

@@ -9,11 +9,11 @@
 //
 // ----------------------------------------------------------------------
 
+#include <sstream>
 
+#include "CLHEP/Cast/defs.h"
 #include "CLHEP/Cast/itos.h"
 
-#include <sstream>
-
 
 std::string  itos( long i )  {
 

Exceptions/test/Makefile.am

@@ -63,6 +63,17 @@ if USING_ICC
 # Exceptions is not supported for icc
 TESTS = 
 else
+if BUILD_VISUAL
+#avoid problems with vc8/9
+TESTS = \
+	testExceptions.sh 	\
+	testThrowFrom.sh	\
+	exctest1.sh 		\
+	exctest2.sh 		\
+	exctest3.sh 		\
+	exctest4.sh 		\
+ 	exctestNothrow.sh	
+else
 TESTS = \
 	testExceptions.sh 	\
 	testzmex.sh		\
@@ -73,6 +84,7 @@ TESTS = \
 	exctest4.sh 		\
  	exctestNothrow.sh	
 endif
+endif
 
 # 	excDblThrow.sh
 

Random/src/Makefile.am

@@ -79,7 +79,7 @@ $(shareddir)/%.$(OBJEXT): %.cc
 	$(CXXCOMPILE) $(SHFLAGS) /c /Fo$@ $<
 else
 $(lib_shared): $(libCLHEP_Random_@VERSION@_so_OBJECTS)
-	$(CXXLINK) $(SHLINK) $(SHNAME)$@ $(libCLHEP_Random_@VERSION@_so_OBJECTS) -o $@
+	$(CXXLINK) $(SHLINK) $(SHNAME)$@ $(libCLHEP_Random_@VERSION@_so_OBJECTS)
 
 $(shareddir)/%.$(OBJEXT): %.cc
 	$(CXXCOMPILE) $(SHFLAGS) -c -o $@ $<

Random/src/RanluxEngine.cc

-// $Id: RanluxEngine.cc,v 1.4.4.2 2005/04/15 16:32:53 garren Exp $
+// $Id: RanluxEngine.cc,v 1.4.4.2.2.1 2008/08/05 18:55:22 garren Exp $
 // -*- C++ -*-
 //
 // -----------------------------------------------------------------------
@@ -528,8 +528,8 @@ void RanluxEngine::flatArray(const int size, double* vect)
 } 
 
 RanluxEngine::operator unsigned int() {
-   return (unsigned int)(flat() * exponent_bit_32) & 0xffffffff |
-         ((unsigned int)(float_seed_table[i_lag]*exponent_bit_32)>>16) & 0xff;
+   return ((unsigned int)(flat() * exponent_bit_32) & 0xffffffff) |
+         (((unsigned int)(float_seed_table[i_lag]*exponent_bit_32)>>16) & 0xff);
    // needed because Ranlux doesn't fill all bits of the double
    // which therefore doesn't fill all bits of the integer.
 }

Random/test/testRandDists.cc

 // -*- C++ -*-
-// $Id: testRandDists.cc,v 1.5.4.3 2008/07/17 19:00:45 garren Exp $
+// $Id: testRandDists.cc,v 1.5.4.3.2.1 2008/08/05 18:55:22 garren Exp $
 // ----------------------------------------------------------------------
 
 // ----------------------------------------------------------------------
@@ -47,6 +47,7 @@
 #include <iomanip>
 #include <cmath>		// double abs()
 #include <stdlib.h>		// int abs()
+#include <cstdlib>		// for exit()
 
 using std::cin;
 using std::cout;

Vector/configure.in

@@ -208,7 +208,7 @@ g++)
       build_static="yes"
       build_shared="no"
       ;;
-    *) 
+   *) 
       AM_CXXFLAGS="-O -ansi -pedantic -Wall"
       MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
       MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
@@ -252,7 +252,7 @@ c++)
       build_static="yes"
       build_shared="no"
       ;;
-    *) 
+   *) 
       AM_CXXFLAGS="-O -ansi -pedantic -Wall"
       MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
       MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"