Correcting coding convention violations

[u/mrichter/AliRoot.git] / TGeant4 / TG4Globals.h

diff --git a/TGeant4/TG4Globals.h b/TGeant4/TG4Globals.h
index 0731ccc1ac496367e79a669fd8f86e14c5bc9e36..df2bca0e47911df1a994af0627c4c41bc4e5d3a8 100644 (file)
--- a/TGeant4/TG4Globals.h
+++ b/TGeant4/TG4Globals.h
@@ -8,20 +8,22 @@
 #ifndef TG4_GLOBALS_H
 #define TG4_GLOBALS_H
 
-#include "TG3Flag.h"
-
 #include <globals.hh>
 #include <g4std/vector>
+#include <g4std/set>
 #include <g4rw/tvordvec.h>
 #include <g4rw/tpordvec.h>
+#include <G4RotationMatrix.hh>
 
 class G4Material;
 class G4Element;
 
-typedef vector<G4bool>   TG4boolVector;
+typedef G4std::vector<G4bool>  TG4boolVector;
+typedef G4std::vector<G4int>   TG4intVector;
+typedef G4std::vector<const G4RotationMatrix*> TG4RotationMatrixVector;
+typedef G4std::set <G4String, G4std::less<G4String> > TG4StringSet; 
 typedef G4RWTValOrderedVector<G4double> TG4doubleVector;
 typedef G4RWTValOrderedVector<G4String> TG4StringVector;
-typedef G4RWTValOrderedVector<TG3FlagValue> TG3FlagVector;
 typedef G4RWTPtrOrderedVector<G4Material>   TG4MaterialVector;
 typedef G4RWTPtrOrderedVector<G4Element>    TG4ElementVector;  
 
@@ -38,6 +40,7 @@ class TG4Globals
       // program - according to G4Exception.cc
     static void Warning(const char* string=0);
       // Global warning function prints string to cerr
+    static void AppendNumberToString(G4String& string, G4int number);
 
   protected:
     TG4Globals();