RF: Move "using namespace" statements to source files

histogram.cc

@@ -10,10 +10,9 @@
 #include "histogram.h"
 
 using namespace std;
+using namespace NEWMAT;
 
-#ifndef NO_NAMESPACE
 namespace MISCMATHS {
-#endif
 
   float Histogram::getPercentile(float perc) 
   {
@@ -267,11 +266,6 @@ namespace MISCMATHS {
       }
     }
   }
-  
-#ifndef NO_NAMESPACE
-  }
-#endif
-
 
 
 

kernel.cc

@@ -9,6 +9,8 @@
 #include "kernel.h"
 #include "miscmaths.h"
 
+using namespace NEWMAT;
+
 namespace MISCMATHS {
 
   set<kernelstorage*, kernelstorage::comparer> kernel::existingkernels;  

minimize.cc

@@ -17,9 +17,6 @@
 #include "miscmaths.h"
 #include "minimize.h"
 
-#define WANT_STREAM
-#define WANT_MATH
-
 using namespace NEWMAT;
 using namespace std;
 ///////////////////////////////////////////////////////

miscmaths.cc

@@ -15,8 +15,11 @@
 #include "miscprob.h"
 #include "stdlib.h"
 #include "armawrap/newmatio.h"
+#include "NewNifti/NewNifti.h"
 
 using namespace std;
+using namespace NEWMAT;
+using namespace NiftiIO;
 
 namespace MISCMATHS {
 

optimise.cc

@@ -14,6 +14,9 @@
 #include "optimise.h"
 #include "miscmaths.h"
 
+using namespace NEWMAT;
+using namespace std;
+
 namespace MISCMATHS {
 
   // The following lines are ignored by the current SGI compiler

rungekutta.cc

@@ -9,6 +9,7 @@
 #include "rungekutta.h"
 
 using namespace std;
+using namespace NEWMAT;
 
 namespace MISCMATHS {