Remove obsolete config flag CGAL_CFG_USING_BASE_MEMBER_BUG.

This commit is contained in:
Sylvain Pion 2007-08-09 09:55:09 +00:00
parent 76408cc24f
commit a3def1c3eb
5 changed files with 2 additions and 105 deletions

View File

@ -52,8 +52,7 @@ private:
public: public:
#if defined(_MSC_VER) || defined(__sgi) \ #if defined(_MSC_VER) || defined(__sgi)
|| defined(CGAL_CFG_USING_BASE_MEMBER_BUG)
bool operator()(bool b) const { bool operator()(bool b) const {
return Base::operator()(b); return Base::operator()(b);
} }

View File

@ -62,26 +62,7 @@ public:
typedef K2 Target_kernel; typedef K2 Target_kernel;
typedef Converter Number_type_converter; typedef Converter Number_type_converter;
#ifdef CGAL_CFG_USING_BASE_MEMBER_BUG
bool operator()(bool b) const { return Base::operator()(b); }
Sign operator()(Sign s) const { return Base::operator()(s); }
Oriented_side operator()(Oriented_side os) const {
return Base::operator()(os);
}
Bounded_side operator()(Bounded_side bs) const {
return Base::operator()(bs);
}
Comparison_result operator()(Comparison_result cr) const {
return Base::operator()(cr);
}
Angle operator()(Angle a) const { return Base::operator()(a); }
#else
using Base::operator(); using Base::operator();
#endif
Cartesian_converter() // To shut up a warning with SunPRO. Cartesian_converter() // To shut up a warning with SunPRO.
: c(), k() {} : c(), k() {}

View File

@ -52,26 +52,7 @@ public:
typedef RT_Converter Ring_number_type_converter; typedef RT_Converter Ring_number_type_converter;
typedef FT_Converter Field_number_type_converter; typedef FT_Converter Field_number_type_converter;
#ifdef CGAL_CFG_USING_BASE_MEMBER_BUG
bool operator()(bool b) const { return Base::operator()(b); }
Sign operator()(Sign s) const { return Base::operator()(s); }
Oriented_side operator()(Oriented_side os) const {
return Base::operator()(os);
}
Bounded_side operator()(Bounded_side bs) const {
return Base::operator()(bs);
}
Comparison_result operator()(Comparison_result cr) const {
return Base::operator()(cr);
}
Angle operator()(Angle a) const { return Base::operator()(a); }
#else
using Base::operator(); using Base::operator();
#endif
Bbox_2 Bbox_2
operator()(const Bbox_2& b) operator()(const Bbox_2& b)

View File

@ -1,63 +0,0 @@
// Copyright (c) 2004 Utrecht University (The Netherlands),
// ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany),
// INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg
// (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria),
// and Tel-Aviv University (Israel). 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) : Menelaos Karavelas, Sylvain Pion
// ---------------------------------------------------------------------
// A short test program to evaluate a C++ compiler.
// This program is used by install_cgal.
// The following documentation will be pasted in the generated configfile.
// ---------------------------------------------------------------------
//| This flag is set if the compiler doesn't support "using Base::Member;" in
//| a derived class. The workaround is to write a forwarder.
//| At least g++ 2.95 and SunPro CC 5.3 have this bug.
template < typename T >
void kill_unused_warning(const T&) {}
struct A
{
int operator()(int a) const { return a; }
};
template<class T>
struct B : public A
{
using A::operator();
T operator()(const T& t) const
{ return t+1; }
};
int main()
{
B<double> b;
double d1(0), d2(0);
d2 = b(d1);
kill_unused_warning(d1);
kill_unused_warning(d2);
return 0;
}

View File

@ -118,8 +118,7 @@ public:
return convert_site(t, intersections_tag()); return convert_site(t, intersections_tag());
} }
#if defined(CGAL_CFG_USING_BASE_MEMBER_BUG) || defined(_MSC_VER) \ #if defined(_MSC_VER) || defined(__sgi)
|| defined(__sgi)
K2_Point_2 K2_Point_2
operator()(const K1_Point_2& p) const operator()(const K1_Point_2& p) const
{ {