Import Geant4 5.2.0 source tree

source/tracking/include/G4VTrajectory.hh

@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4VTrajectory.hh,v 1.11 2002/11/08 18:17:04 johna Exp $
-// GEANT4 tag $Name: geant4-05-01 $
+// $Id: G4VTrajectory.hh,v 1.12 2003/06/16 17:13:15 gunter Exp $
+// GEANT4 tag $Name: geant4-05-02 $
 //
 //
 //---------------------------------------------------------------
@@ -44,8 +44,8 @@
 #define G4VTrajectory_h 1
 
 #include "globals.hh"
-#include "g4std/vector"
-#include "g4std/map"
+#include <vector>
+#include <map>
 #include "G4ThreeVector.hh"
 
 class G4Step;
@@ -82,7 +82,7 @@ class G4VTrajectory
    // Returns the number of trajectory points
    virtual G4VTrajectoryPoint* GetPoint(G4int i) const = 0;
    // Returns i-th trajectory point.
-   virtual void ShowTrajectory(G4std::ostream& os=G4cout) const;
+   virtual void ShowTrajectory(std::ostream& os=G4cout) const;
    // Convert attributes in trajectory (and trajectory point if
    // needed) to ostream.  A default implementation in this base class
    // may be used or may be overridden in the concrete class.  Note:
@@ -91,12 +91,12 @@ class G4VTrajectory
    virtual void DrawTrajectory(G4int i_mode=0) const;
    // Draw the trajectory.  A default implementation in this base
    // class may be used or may be overridden in the concrete class.
-   virtual const G4std::map<G4String,G4AttDef>* GetAttDefs() const
+   virtual const std::map<G4String,G4AttDef>* GetAttDefs() const
    { return 0; }
    // If implemented by a derived class, returns a pointer to a map of
    // attribute definitions for the attribute values below.  The user
    // must test the validity of this pointer.
-   virtual G4std::vector<G4AttValue>* CreateAttValues() const
+   virtual std::vector<G4AttValue>* CreateAttValues() const
    { return 0; }
    // If implemented by a derived class, returns a pointer to a list
    // of attribute values suitable, e.g., for picking.  Each must