From fdfb030ca74cb2f6e3bc2f84aa86b0d5783543e9 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sat, 2 Jul 2011 08:58:57 +0000
Subject: [PATCH] Merge bad file name fixes and TR1 breakages from Trunk.
 Authorized by Daniel James.

[SVN r72845]
---
 include/boost/math/tr1.hpp    | 2 --
 test/test_basic_nonfinite.cpp | 2 +-
 test/test_lexical_cast.cpp    | 2 +-
 test/test_nonfinite_trap.cpp  | 2 +-
 test/test_signed_zero.cpp     | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/boost/math/tr1.hpp b/include/boost/math/tr1.hpp
index e057c3403..6a3d078d8 100644
--- a/include/boost/math/tr1.hpp
+++ b/include/boost/math/tr1.hpp
@@ -104,7 +104,6 @@ namespace boost{ namespace math{ namespace tr1{ extern "C"{
 #  include <boost/config/auto_link.hpp>
 #endif
 
-#if !defined(__cplusplus) && defined(FLT_EVAL_METHOD) && (FLT_EVAL_METHOD > 2)
 #ifndef FLT_EVAL_METHOD
 typedef float float_t;
 typedef double double_t;
@@ -118,7 +117,6 @@ typedef double double_t;
 typedef long double float_t;
 typedef long double double_t;
 #endif
-#endif
 
 // C99 Functions:
 double BOOST_MATH_TR1_DECL boost_acosh BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
diff --git a/test/test_basic_nonfinite.cpp b/test/test_basic_nonfinite.cpp
index 1b8fc518b..324a8be67 100644
--- a/test/test_basic_nonfinite.cpp
+++ b/test/test_basic_nonfinite.cpp
@@ -35,7 +35,7 @@ and checks that can input C99 infinity and NaN too.
 #include <boost/test/auto_unit_test.hpp>
 
 #include "almost_equal.ipp"
-#include "S_.ipp"
+#include "s_.ipp"
 
 #include <boost/math/special_functions/nonfinite_num_facets.hpp>
 
diff --git a/test/test_lexical_cast.cpp b/test/test_lexical_cast.cpp
index 36807511d..cd71a6879 100644
--- a/test/test_lexical_cast.cpp
+++ b/test/test_lexical_cast.cpp
@@ -23,7 +23,7 @@
 #include <boost/math/special_functions/sign.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
 #include "almost_equal.ipp"
-#include "S_.ipp"
+#include "s_.ipp"
 
 namespace {
 
diff --git a/test/test_nonfinite_trap.cpp b/test/test_nonfinite_trap.cpp
index 628ae9e91..af468c887 100644
--- a/test/test_nonfinite_trap.cpp
+++ b/test/test_nonfinite_trap.cpp
@@ -15,7 +15,7 @@
 #include <sstream>
 #include <boost/test/auto_unit_test.hpp>
 #include "almost_equal.ipp"
-#include "S_.ipp"
+#include "s_.ipp"
 #include <boost/math/special_functions/nonfinite_num_facets.hpp>
 
 namespace {
diff --git a/test/test_signed_zero.cpp b/test/test_signed_zero.cpp
index 45186da2b..042855e97 100644
--- a/test/test_signed_zero.cpp
+++ b/test/test_signed_zero.cpp
@@ -20,7 +20,7 @@
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/math/special_functions/nonfinite_num_facets.hpp>
 #include "almost_equal.ipp"
-#include "S_.ipp"
+#include "s_.ipp"
 
 namespace {