13 files changed, 21 insertions, 18 deletions
diff --git a/src/jtutil/cpm_map.cc b/src/jtutil/cpm_map.cc
index db04d75..90a7dba 100644
--- a/src/jtutil/cpm_map.cc
+++ b/src/jtutil/cpm_map.cc
@@ -10,6 +10,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+
 #include "stdc.h"
 #include "util.hh"
 #include "cpm_map.hh"
diff --git a/src/jtutil/fuzzy.cc b/src/jtutil/fuzzy.cc
index e6b598d..581adfe 100644
--- a/src/jtutil/fuzzy.cc
+++ b/src/jtutil/fuzzy.cc
@@ -10,7 +10,6 @@
 // ***** template instantiations *****
 //
 
-#include <algorithm>
 #include "stdc.h"
 #include "util.hh"
 
@@ -21,8 +20,8 @@ namespace jtutil
 template <typename fp>
 bool fuzzy<fp>::EQ(fp x, fp y)
 {
-fp max_abs = std::max(jtutil::abs(x), jtutil::abs(y));
-fp epsilon = std::max(tolerance, tolerance*max_abs);
+fp max_abs = jtutil::max(jtutil::abs(x), jtutil::abs(y));
+fp epsilon = jtutil::max(tolerance, tolerance*max_abs);
 
 return jtutil::abs(x-y) <= epsilon;
 }
diff --git a/src/jtutil/linear_map.cc b/src/jtutil/linear_map.cc
index 41a779e..ad4666b 100644
--- a/src/jtutil/linear_map.cc
+++ b/src/jtutil/linear_map.cc
@@ -12,6 +12,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+
 #include "stdc.h"
 #include "util.hh"
 #include "linear_map.hh"
diff --git a/src/jtutil/miscfp.cc b/src/jtutil/miscfp.cc
index 3d19276..fb59352 100644
--- a/src/jtutil/miscfp.cc
+++ b/src/jtutil/miscfp.cc
@@ -8,6 +8,7 @@
 //
 
 #include <math.h>
+
 #include "stdc.h"
 #include "util.hh"
 
@@ -50,7 +51,7 @@ namespace jtutil
 	  {
 double hypot3(double x, double y, double z)
 {
-return std::sqrt(x*x + y*y + z*z);
+return sqrt(x*x + y*y + z*z);
 }
 	  }	// namespace jtutil::
 
@@ -74,7 +75,7 @@ namespace jtutil
 double arctan_xy(double x, double y)
 {
 // note reversed argument order (y,x) in std::atan2() function
-return ((x == 0.0) && (y == 0.0)) ? 0.0 : std::atan2(y,x);
+return ((x == 0.0) && (y == 0.0)) ? 0.0 : atan2(y,x);
 }
 	  }	// namespace jtutil::
 
diff --git a/src/jtutil/norm.cc b/src/jtutil/norm.cc
index 1e6c1b5..bce9ee2 100644
--- a/src/jtutil/norm.cc
+++ b/src/jtutil/norm.cc
@@ -5,8 +5,7 @@
 // *** class jtutil::norm::
 //
 
-#include <cmath>
-#include <algorithm>
+#include <math.h>
 #include <assert.h>
 
 #include "util.hh"
@@ -22,7 +21,7 @@ template <typename fp>
 ++N_;
 sum_  += x;
 sum2_ += x*x;
-infinity_norm_ = std::max(infinity_norm_, jtutil::abs<fp>(x));
+infinity_norm_ = jtutil::max(infinity_norm_, jtutil::abs<fp>(x));
 }
 	  }	// namespace jtutil::
 
@@ -34,10 +33,10 @@ namespace jtutil
 template<typename fp>
   fp norm<fp>::mean() const { return sum_/fp(N_); }
 template<typename fp>
-  fp norm<fp>::two_norm() const { return std::sqrt(sum2_); }
+  fp norm<fp>::two_norm() const { return sqrt(sum2_); }
 template<typename fp>
   fp norm<fp>::rms_norm() const
-	{ assert(is_nonempty()); return std::sqrt(sum2_/fp(N_)); }
+	{ assert(is_nonempty()); return sqrt(sum2_/fp(N_)); }
 template<typename fp>
   fp norm<fp>::infinity_norm() const { return infinity_norm_; }
 	  }	// namespace jtutil::
diff --git a/src/jtutil/test_array.cc b/src/jtutil/test_array.cc
index cf13c6d..dfca98e 100644
--- a/src/jtutil/test_array.cc
+++ b/src/jtutil/test_array.cc
@@ -4,7 +4,6 @@
 #include <assert.h>
 #include <stdio.h>
 #include <math.h>
-using std::printf;
 
 #include "stdc.h"
 #include "util.hh"
diff --git a/src/jtutil/test_cpm_map.cc b/src/jtutil/test_cpm_map.cc
index 8b5b182..070321a 100644
--- a/src/jtutil/test_cpm_map.cc
+++ b/src/jtutil/test_cpm_map.cc
@@ -3,6 +3,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+
 #include "stdc.h"
 #include "util.hh"
 #include "cpm_map.hh"
diff --git a/src/jtutil/test_fuzzy.cc b/src/jtutil/test_fuzzy.cc
index 3384d23..b68d9e5 100644
--- a/src/jtutil/test_fuzzy.cc
+++ b/src/jtutil/test_fuzzy.cc
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include <assert.h>
+
 #include "stdc.h"
 #include "util.hh"
 using jtutil::error_exit;
diff --git a/src/jtutil/test_linear_map.cc b/src/jtutil/test_linear_map.cc
index 1243cc6..0a185e7 100644
--- a/src/jtutil/test_linear_map.cc
+++ b/src/jtutil/test_linear_map.cc
@@ -3,6 +3,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+
 #include "stdc.h"
 #include "util.hh"
 #include "linear_map.hh"
diff --git a/src/jtutil/test_modulo.cc b/src/jtutil/test_modulo.cc
index 322ddd7..c587ea6 100644
--- a/src/jtutil/test_modulo.cc
+++ b/src/jtutil/test_modulo.cc
@@ -3,6 +3,7 @@
 
 #include <stdio.h>
 #include <assert.h>
+
 #include "stdc.h"
 #include "util.hh"
 using jtutil::error_exit;
diff --git a/src/jtutil/test_norm.cc b/src/jtutil/test_norm.cc
index 6f89030..b156873 100644
--- a/src/jtutil/test_norm.cc
+++ b/src/jtutil/test_norm.cc
@@ -1,11 +1,9 @@
 // test_norm -- quick-n-dirty test of norm template class
 // $Header$
 
-#include <cstdio>
-#include <cassert>
-#include <cmath>
-using std::printf;
-using std::sqrt;
+#include <stdio.h>
+#include <assert.h>
+#include <math.h>
 
 #include "stdc.h"
 #include "util.hh"
diff --git a/src/jtutil/test_round.cc b/src/jtutil/test_round.cc
index faf4942..e5a900f 100644
--- a/src/jtutil/test_round.cc
+++ b/src/jtutil/test_round.cc
@@ -3,6 +3,7 @@
 
 #include <stdio.h>
 #include <assert.h>
+
 #include "stdc.h"
 #include "util.hh"
 using jtutil::round;
diff --git a/src/jtutil/util.hh b/src/jtutil/util.hh
index fa46f70..bdc4f86 100644
--- a/src/jtutil/util.hh
+++ b/src/jtutil/util.hh
@@ -20,8 +20,8 @@ inline int is_odd (int i) { return  (i & 0x1); }
 
 //
 // min/max/absolute value template
-// FIXME: <cmath> puts this in std::, but older g++ versions
-//	  (which don't fully implement namespaces) get confused
+// FIXME: <algorithm> is supposed to have min/max, but these are
+//	  broken on too many platforms (eg older gcc versions)
 //
 template <typename fp>
   inline fp min(fp x, fp y) { return (x < y) ? x : y; }