Import Geant4 5.2.0 source tree

examples/extended/geometry/olap/src/OlapEventAction.cc

@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: OlapEventAction.cc,v 1.1 2002/06/04 07:40:21 gcosmo Exp $
-// GEANT4 tag $Name: geant4-05-01 $
+// $Id: OlapEventAction.cc,v 1.3 2003/06/16 16:49:26 gunter Exp $
+// GEANT4 tag $Name: geant4-05-02 $
 //
 // 
 // --------------------------------------------------------------
@@ -32,8 +32,9 @@
 //
 // --------------------------------------------------------------
 //
-#include "g4std/vector"
-#include "g4std/strstream"
+#include "globals.hh"
+#include <vector>
+#include <strstream>
 
 #include "G4VVisManager.hh"
 #include "G4Trajectory.hh"
@@ -52,8 +53,8 @@
 //#define OLAP_DEBUG
 //#define OLAP_DEBUG_2
 
-G4std::ostream & 
-   operator<<(G4std::ostream& flux, OlapInfo & oi)
+std::ostream & 
+   operator<<(std::ostream& flux, OlapInfo & oi)
 {
     OlapStepInfo si;
     si.thePoint = oi.v1;
@@ -145,11 +146,8 @@ OlapEventAction::~OlapEventAction()
 }
 
 
-void OlapEventAction::BeginOfEventAction(const G4Event* anEvent)
+void OlapEventAction::BeginOfEventAction(const G4Event*)
 {
-   // G4cout << ">>>evt=" << anEvent->GetEventID() << " run=" << 
-   // anEvent->G4endl;
-    
     while (!ABSteps.empty())
     {
        if (! dontDelete ) 
@@ -274,7 +272,7 @@ void OlapEventAction::EndOfEventAction(const G4Event* anEvent)
      oi->probNot = true; // probably not an overlap, just numerics ....
      dontDelete = true;
           
-     G4std::ostrstream os;
+     std::ostrstream os;
      os << "A,B diff. steps AB:" << ABSteps.size()
                       << " BA:"  << BASteps.size() << '\0';
 
@@ -332,7 +330,7 @@ void OlapEventAction::EndOfEventAction(const G4Event* anEvent)
 
 G4bool OlapEventAction::InsertOI(OlapInfo * oi)
 {
-   G4std::vector<OlapInfo*>::iterator it = theRunAction->theOlaps.begin();
+   std::vector<OlapInfo*>::iterator it = theRunAction->theOlaps.begin();
    G4bool flag(false);
    while (it != theRunAction->theOlaps.end())
    {