diff --git a/Packages/Configuration/changes.txt b/Packages/Configuration/changes.txt index 4bee1fbd1c6..f36f5e24fb1 100644 --- a/Packages/Configuration/changes.txt +++ b/Packages/Configuration/changes.txt @@ -1,3 +1,6 @@ +2.88 18/12/2003 +- Remove obsolete CGAL_CFG_VC7_PRIVATE_TYPE_BUG and CGAL_VC7_BUG_PROTECTED. + 2.87 18/12/2003 - Remove obsolete CGAL_CFG_MATCHING_BUG_2[.C] and CGAL_MSVC_DUMMY_ARGUMENT. diff --git a/Packages/Configuration/config/testfiles/CGAL_CFG_VC7_PRIVATE_TYPE_BUG.C b/Packages/Configuration/config/testfiles/CGAL_CFG_VC7_PRIVATE_TYPE_BUG.C deleted file mode 100644 index 31469a3d1dc..00000000000 --- a/Packages/Configuration/config/testfiles/CGAL_CFG_VC7_PRIVATE_TYPE_BUG.C +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (c) 2002 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. -// -// $Source$ -// $Revision$ $Date$ -// $Name$ -// -// Author(s) : Sylvain Pion - -// CGAL_CFG_VC7_PRIVATE_TYPE_BUG.C -// --------------------------------------------------------------------- -// A short test program to evaluate a C++ compiler. -// This program is used by cgal_configure. -// The following documentation will be pasted in the generated configfile. -// --------------------------------------------------------------------- - -//| This is a test-case for a bug in VC++ 7.0 beta2 that occurs in the kernel. -//| When the bug is present, CGAL_CFG_VC7_PRIVATE_TYPE_BUG is set. - -template -class A -{ - typedef typename R::B B; -public: - - A() :i(0) {} - - int i; -}; - -template -class B -: public R::A -{ -public: - typedef typename R::A base; - B() : base() {} -}; - -template -class RR -{ -public: - typedef ::A A; - typedef ::B B; -}; - -int main() -{ - typedef RR r; - A a; - B b; - (void) a; - (void) b; - return 0; -} diff --git a/Packages/Configuration/include/CGAL/config.h b/Packages/Configuration/include/CGAL/config.h index 26688792e38..f7a99d12583 100644 --- a/Packages/Configuration/include/CGAL/config.h +++ b/Packages/Configuration/include/CGAL/config.h @@ -78,12 +78,6 @@ # define CGAL_END_NAMESPACE #endif -#ifdef CGAL_CFG_VC7_PRIVATE_TYPE_BUG -# define CGAL_VC7_BUG_PROTECTED protected: -#else -# define CGAL_VC7_BUG_PROTECTED -#endif - #define CGAL_NULL_TMPL_ARGS <> #ifdef CGAL_CFG_NO_STDC_NAMESPACE