FileStager: Fix placement of using directives.

Using directives should not appear in the global namespace in headers.

Database/FileStager/FileStager/TStageFileInfo.h

@@ -20,7 +20,6 @@
 #include <string>
 #include <map>
 
-using namespace std ;
 
 class TStageFileInfo  : public TObject 
 {
@@ -33,14 +32,14 @@ class TStageFileInfo  : public TObject
   virtual ~TStageFileInfo() {};
 
   int  pid;
-  string inFile;
-  string outFile;
+  std::string inFile;
+  std::string outFile;
   Status status;
 #ifndef __CINT__
   struct stat64 statFile;
 #endif
-  string stout;
-  string sterr;
+  std::string stout;
+  std::string sterr;
 
  private:
 

Database/FileStager/FileStager/TStageManager.h

@@ -32,7 +32,6 @@
 #include <map>
 #include <algorithm>
 
-using namespace std ;
 
 class TStagerInfo;
 
@@ -49,7 +48,7 @@ class TStageManager : public TObject
   void releaseFile(const char* fname);
   void releaseAll();
   const char* getFile(const char* fname);
-  const string getTmpFilename(const char* filename);
+  const std::string getTmpFilename(const char* filename);
   TStageFileInfo::Status getStatusOf(const char* filename, bool update=true);
 
   void setBaseTmpdir(const char* baseTmpdir);
@@ -93,18 +92,18 @@ class TStageManager : public TObject
 
   void stageNext(bool forceStage=false);
   void updateStatus();
-  void trim(string& input);
-  void removePrefixOf(string& filename);
-  void removeFile(string filename);
-  void fixRootInPrefix(string& tmpname);
+  void trim(std::string& input);
+  void removePrefixOf(std::string& filename);
+  void removeFile(std::string filename);
+  void fixRootInPrefix(std::string& tmpname);
 
   void submitStageMonitor();
   bool _submittedStageMonitor;
 
   bool fileExists(const char* fileName);
 
-  list< string > _toBeStagedList;
-  map<string,TStageFileInfo> _stageMap;
+  std::list< std::string > _toBeStagedList;
+  std::map<std::string,TStageFileInfo> _stageMap;
 
   static TStagerInfo _stagerInfo;
 

Database/FileStager/FileStager/TStagerInfo.h

@@ -26,7 +26,6 @@
 #include <vector>
 #include <map>
   
-using namespace std ;
   
 typedef char* pchar;
 
@@ -41,15 +40,15 @@ class TStagerInfo : public TObject
 
   int pipeLength;
   int pid;
-  string infilePrefix;
-  string outfilePrefix;
-  string logfileDir;
-  string baseTmpdir;
-  string tmpdir;
-  string cpcommand;
-  string stagemonitorcmd;
-  vector<string> cparg;
-  map<string,string> inPrefixMap;
+  std::string infilePrefix;
+  std::string outfilePrefix;
+  std::string logfileDir;
+  std::string baseTmpdir;
+  std::string tmpdir;
+  std::string cpcommand;
+  std::string stagemonitorcmd;
+  std::vector<std::string> cparg;
+  std::map<std::string,std::string> inPrefixMap;
  
  private:
 

Database/FileStager/Root/TCopyFile.cxx

@@ -7,6 +7,8 @@
 //#include "TROOT.h"
 //#include "TEnv.h"
 
+using std::string;
+
 ClassImp(TCopyFile)
 
 bool TCopyFile::_originalTFile=true;

Database/FileStager/Root/TStageManager.cxx

@@ -8,6 +8,14 @@
 #include <assert.h>
 
 
+using std::string;
+using std::cout;
+using std::cerr;
+using std::endl;
+using std::list;
+using std::map;
+
+
 ClassImp(TStageManager)
 
 

Database/FileStager/Root/TStagerInfo.cxx

@@ -8,6 +8,11 @@
 ClassImp(TStagerInfo)
 
 
+using std::string;
+using std::cerr;
+using std::endl;
+
+
 TStagerInfo::TStagerInfo()
     : pipeLength(1)
     , pid(getpid())