*** main/src/hadd.cxx	Thu Apr  1 19:32:53 2004
--- root-v4.00.03/main/src/hadd.cxx	Fri Apr  2 15:29:44 2004
***************
*** 21,34 ****
  
   */
  
! 
! #include <string.h>
  #include "TChain.h"
  #include "TFile.h"
  #include "TH1.h"
  #include "TKey.h"
  #include "Riostream.h"
  
  
  TList *FileList;
  TFile *Target;
--- 21,34 ----
  
   */
  
! #include <string>
  #include "TChain.h"
  #include "TFile.h"
  #include "TH1.h"
  #include "TKey.h"
  #include "Riostream.h"
  
+ using std::string;
  
  TList *FileList;
  TFile *Target;
***************
*** 37,50 ****
  
  int main( int argc, char **argv ) {
  
!   if (argc < 4) {
!      printf("******Error in invoking hadd\n");
!      printf("===>  hadd targetfile source1 source2 ...\n");
!      printf("      This program will add histograms from a list of root files and write them\n");
!      printf("      to a target root file. The target file is newly created and must not be\n");
!      printf("      identical to one of the source files.\n");
!      printf("      supply at least two source files for this to make sense... ;-)\n");
!      return 1;
    }
     FileList = new TList();
  
--- 37,49 ----
  
  int main( int argc, char **argv ) {
  
!   if ( argc < 4 || "-h" == string(argv[1]) || "--help" == string(argv[1]) ) {
!     cout << "Usage: " << argv[0] << " targetfile source1 source2 [source3 ...]" << endl;
!     cout << "This program will add histograms from a list of root files and write them" << endl;
!     cout << "to a target root file. The target file is newly created and must not be" << endl;
!     cout << "identical to one of the source files." << endl;
!     cout << "Supply at least two source files for this to make sense... ;-)" << endl;
!     return 1;
    }
     FileList = new TList();