From accdf57415c9941728fcbbf723bea517c959c6d6 Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Wed, 2 Jan 2008 16:35:13 +0000 Subject: [PATCH] CGAL_CFG_NO_LONG_DOUBLE_IO is not needed anymore (pgCC is fixed). --- .../testfiles/CGAL_CFG_NO_LONG_DOUBLE_IO.cpp | 37 ------------------- Installation/include/CGAL/config.h | 12 ------ Number_types/test/Number_types/ioformat.cpp | 2 - iostream/test/iostream/test_ioformat.cpp | 4 -- 4 files changed, 55 deletions(-) delete mode 100644 Installation/config/testfiles/CGAL_CFG_NO_LONG_DOUBLE_IO.cpp diff --git a/Installation/config/testfiles/CGAL_CFG_NO_LONG_DOUBLE_IO.cpp b/Installation/config/testfiles/CGAL_CFG_NO_LONG_DOUBLE_IO.cpp deleted file mode 100644 index e185ce33e4a..00000000000 --- a/Installation/config/testfiles/CGAL_CFG_NO_LONG_DOUBLE_IO.cpp +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) 2005 INRIA Sophia-Antipolis (France). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org); you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// -// $URL$ -// $Id$ -// -// -// Author(s) : Sylvain Pion - -// --------------------------------------------------------------------- -// A short test program to evaluate a machine architecture. -// This program is used by install_cgal. -// The following documentation will be pasted in the generated configfile. -// --------------------------------------------------------------------- - -//| Tests if std::cout supports long double IO. -//| pgCC 5.2 and 6.2 have this bug. - -#include - -int main() -{ - long double ld = 3.14; - std::cout << ld << std::endl; - return 0; -} diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 68e72607f50..3035c9c0332 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -69,18 +69,6 @@ # define CGAL_USE_LONG_LONG #endif -#ifdef CGAL_CFG_NO_LONG_DOUBLE_IO -#include -namespace std { - template < typename _CharT, typename _Traits > - inline basic_ostream<_CharT, _Traits> & - operator<<(basic_ostream<_CharT, _Traits> & os, const long double &ld) - { - return os << (double) ld; - } -} -#endif - #ifndef CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG # define CGAL_TYPENAME_DEFAULT_ARG typename diff --git a/Number_types/test/Number_types/ioformat.cpp b/Number_types/test/Number_types/ioformat.cpp index 0c12230293e..f65caf02453 100644 --- a/Number_types/test/Number_types/ioformat.cpp +++ b/Number_types/test/Number_types/ioformat.cpp @@ -69,9 +69,7 @@ int main() #endif TESTIT(float, "float") TESTIT(double, "double") -#ifndef CGAL_CFG_NO_LONG_DOUBLE_IO TESTIT(long double, "long double") -#endif // CGAL number types //TESTIT(CGAL::MP_Float, "MP_Float") diff --git a/iostream/test/iostream/test_ioformat.cpp b/iostream/test/iostream/test_ioformat.cpp index 899dede2d6f..b25782d1df1 100644 --- a/iostream/test/iostream/test_ioformat.cpp +++ b/iostream/test/iostream/test_ioformat.cpp @@ -89,14 +89,10 @@ int main() { test_io(0); test_io(-12); -#ifdef CGAL_CFG_NO_LONG_DOUBLE_IO - std::cout << "test_io: long double is not performed due to compiler bug"<< std::endl; -#else std::cout << "test_io: long double "<< std::endl; test_io(12); test_io(0); test_io(-12); -#endif //TODO: add more std::cout << "ok" <