Merged in the patches that Michael Hanke did

diff_pvm.cc

@@ -9,7 +9,7 @@
 #include <iostream>
 #include <fstream>
 #include <iomanip>
-#include <strstream>
+#include <sstream>
 #define WANT_STREAM
 #define WANT_MATH
 //  #include "newmatap.h"

diff_pvmoptions.cc

@@ -9,8 +9,8 @@
 #define WANT_STREAM
 #define WANT_MATH
 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "diff_pvmoptions.h"

diff_pvmoptions.h

@@ -10,8 +10,8 @@
 #define Diff_pvmOptions_h
 
 #include <string>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "utils/options.h"

dtifitOptions.cc

@@ -9,8 +9,8 @@
 #define WANT_STREAM
 #define WANT_MATH
 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "dtifitOptions.h"

dtifitOptions.h

@@ -10,8 +10,8 @@
 #define dtifitOptions_h
 
 #include <string>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "utils/options.h"

probtrackOptions.cc

@@ -9,8 +9,8 @@
 #define WANT_STREAM
 #define WANT_MATH
 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "probtrackOptions.h"

probtrackOptions.h

@@ -10,8 +10,8 @@
 #define probtrackOptions_h
 
 #include <string>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "utils/options.h"

probtrackxOptions.cc

@@ -9,8 +9,8 @@
 #define WANT_STREAM
 #define WANT_MATH
 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "probtrackxOptions.h"

probtrackxOptions.h

@@ -10,8 +10,8 @@
 #define probtrackxOptions_h
 
 #include <string>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "utils/options.h"

replacevols.cc

@@ -33,7 +33,7 @@ int read_avg_file (vector<vector<int> >& avgs,const string fname){
 	}
       }
 
-      istrstream mylinestr(myline.c_str());   
+      istringstream mylinestr(myline.c_str());   
 
       while(!mylinestr.eof()){
 

testfile.cc

@@ -17,7 +17,7 @@ using namespace NEWIMAGE;
   string myline;
   else{
       avg_file.getline(myline);
-      istrstream mylinestr(myline);
+      istringstream mylinestr(myline);
       mylinestr>>start;
       mylinestr>>length;
       cerr<<start<<" "<<length<<endl;

tractOptions.cc

@@ -9,8 +9,8 @@
 #define WANT_STREAM
 #define WANT_MATH
 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "tractOptions.h"

tractOptions.h

@@ -10,8 +10,8 @@
 #define tractOptions_h
 
 #include <string>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "utils/options.h"

tractOpts.h

@@ -10,8 +10,8 @@
 #define tractOptions_h
 
 #include <string>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "utils/options.h"

xfibres.cc

@@ -9,7 +9,7 @@
 #include <iostream>
 #include <fstream>
 #include <iomanip>
-#include <strstream>
+#include <sstream>
 #define WANT_STREAM
 #define WANT_MATH
 //  #include "newmatap.h"

xfibresoptions.cc

@@ -9,8 +9,8 @@
 #define WANT_STREAM
 #define WANT_MATH
 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "xfibresoptions.h"

xfibresoptions.h

@@ -10,8 +10,8 @@
 #define xfibresOptions_h
 
 #include <string>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "utils/options.h"