From 84e796b896c3b762a142fe5883f308dc79cd2c9b Mon Sep 17 00:00:00 2001
From: Mark Jenkinson <mark@fmrib.ox.ac.uk>
Date: Wed, 8 Mar 2006 11:05:46 +0000
Subject: [PATCH] Merged in the patches that Michael Hanke did

---
 diff_pvm.cc          | 2 +-
 diff_pvmoptions.cc   | 4 ++--
 diff_pvmoptions.h    | 4 ++--
 dtifitOptions.cc     | 4 ++--
 dtifitOptions.h      | 4 ++--
 probtrackOptions.cc  | 4 ++--
 probtrackOptions.h   | 4 ++--
 probtrackxOptions.cc | 4 ++--
 probtrackxOptions.h  | 4 ++--
 replacevols.cc       | 2 +-
 testfile.cc          | 2 +-
 tractOptions.cc      | 4 ++--
 tractOptions.h       | 4 ++--
 tractOpts.h          | 4 ++--
 xfibres.cc           | 2 +-
 xfibresoptions.cc    | 4 ++--
 xfibresoptions.h     | 4 ++--
 17 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/diff_pvm.cc b/diff_pvm.cc
index db6404a..7d1ebfe 100644
--- a/diff_pvm.cc
+++ b/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 --git a/diff_pvmoptions.cc b/diff_pvmoptions.cc
index fcef3cd..be14b73 100644
--- a/diff_pvmoptions.cc
+++ b/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 --git a/diff_pvmoptions.h b/diff_pvmoptions.h
index b4440da..784397e 100644
--- a/diff_pvmoptions.h
+++ b/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"
diff --git a/dtifitOptions.cc b/dtifitOptions.cc
index d7eda90..cc4194e 100644
--- a/dtifitOptions.cc
+++ b/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"
diff --git a/dtifitOptions.h b/dtifitOptions.h
index c1aec12..6edab15 100644
--- a/dtifitOptions.h
+++ b/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"
diff --git a/probtrackOptions.cc b/probtrackOptions.cc
index a020c23..abc642e 100644
--- a/probtrackOptions.cc
+++ b/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"
diff --git a/probtrackOptions.h b/probtrackOptions.h
index 8a432de..4717d61 100644
--- a/probtrackOptions.h
+++ b/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"
diff --git a/probtrackxOptions.cc b/probtrackxOptions.cc
index 150531c..682cd47 100644
--- a/probtrackxOptions.cc
+++ b/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"
diff --git a/probtrackxOptions.h b/probtrackxOptions.h
index 72aac7a..9e23fea 100644
--- a/probtrackxOptions.h
+++ b/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"
diff --git a/replacevols.cc b/replacevols.cc
index 46061e4..e728cd8 100644
--- a/replacevols.cc
+++ b/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()){
 
diff --git a/testfile.cc b/testfile.cc
index 847fd1a..099c30f 100644
--- a/testfile.cc
+++ b/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;
diff --git a/tractOptions.cc b/tractOptions.cc
index c5229d2..3a3558a 100644
--- a/tractOptions.cc
+++ b/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"
diff --git a/tractOptions.h b/tractOptions.h
index 034198a..3fbab83 100644
--- a/tractOptions.h
+++ b/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"
diff --git a/tractOpts.h b/tractOpts.h
index 69ceacc..d91219e 100644
--- a/tractOpts.h
+++ b/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"
diff --git a/xfibres.cc b/xfibres.cc
index 1ff4446..9974ae7 100644
--- a/xfibres.cc
+++ b/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"
diff --git a/xfibresoptions.cc b/xfibresoptions.cc
index 42a0a4e..bb560db 100644
--- a/xfibresoptions.cc
+++ b/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"
diff --git a/xfibresoptions.h b/xfibresoptions.h
index 67512bc..f70c3a6 100644
--- a/xfibresoptions.h
+++ b/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"
-- 
GitLab