Import Geant4 1.1.0 source tree

source/global/management/include/globals.hh

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: globals.hh,v 1.11 1999/11/23 15:00:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: globals.hh,v 1.15 2000/01/19 11:12:44 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Global Constants and typedefs
@@ -19,10 +19,10 @@
 // 29.11.96 G.Cosmo - Added typedef of HepBoolean to G4bool
 // 22.10.97 M.Maire - Moved PhysicalConstants at the end of the file
 // 04.12.97 G.Cosmo,E.Tcherniaev - Migrated to CLHEP
-// 05.06.98 M.Maire - temporary (for alpha07) restore G4 system of units 
-// 26.08.98 J.Allison,E.Tcherniaev - introduced min/max/sqr/abs functions
-// 22.09.98 G.Cosmo - removed min/max/sqr/abs functions and replaced with
+// 26.08.98 J.Allison,E.Tcherniaev - Introduced min/max/sqr/abs functions
+// 22.09.98 G.Cosmo - Removed min/max/sqr/abs functions and replaced with
 //                    inclusion of CLHEP/config/TemplateFunctions.h for CLHEP-1.3
+// 15.12.99 G.Gracia - Included min, max definitions for NT with ISO standard
 
 #ifndef GLOBALS_HH
 #define GLOBALS_HH
@@ -32,22 +32,30 @@
 // Undefine possible existing min/max/sqr/abs macros first
 // (temporary solution)
 #ifdef min
-#undef min
+  #undef min
 #endif
 #ifdef max
-#undef max
+  #undef max
 #endif
 #ifdef sqr
-#undef sqr
+  #undef sqr
 #endif
 #ifdef abs
-#undef abs
+  #undef abs
 #endif
 
-#ifdef G4USE_STL
-  #include "g4std/algorithm"
+#include "g4std/algorithm"
+#ifndef CLHEP_MAX_MIN_DEFINED
   #define CLHEP_MAX_MIN_DEFINED
 #endif
+
+#if defined(WIN32) && defined(G4USE_STD_NAMESPACE)
+// For NT with Native STL (used in ISO standard mode)
+// templated functions min and max should be _MIN _MAX
+  #define min _MIN
+  #define max _MAX
+#endif
+
 // min, max, abs and sqr are in TemplateFunctions.h.
 // Includes also CLHEP.h with typedef for numeric types and
 // implicit inclusions of <stdlib.h>, <limits.h>, <math.h>.
@@ -73,10 +81,8 @@
 
 // Global error function
 void G4Exception(const char* s=0);
-#ifdef G4USE_STL
-  void G4Exception(G4std::string s);
-  void G4Exception(G4String s);
-#endif
+void G4Exception(G4std::string s);
+void G4Exception(G4String s);
 
 #endif /* GLOBALS_HH */