From be7851f810c12316807b0d5c8d66007dc96daf39 Mon Sep 17 00:00:00 2001 From: Radu Ursu Date: Fri, 28 Jun 2002 06:59:13 +0000 Subject: [PATCH] Added the NOMINMAX flag --- .../CGAL/config/msvc7/CGAL/compiler_config.h | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Packages/wininst/include/CGAL/config/msvc7/CGAL/compiler_config.h b/Packages/wininst/include/CGAL/config/msvc7/CGAL/compiler_config.h index 1314eebba26..3bd5818d2cc 100644 --- a/Packages/wininst/include/CGAL/config/msvc7/CGAL/compiler_config.h +++ b/Packages/wininst/include/CGAL/config/msvc7/CGAL/compiler_config.h @@ -1,22 +1,13 @@ -// ============================================================== // Copyright (c) 1998, 1999 The CGAL Consortium // // This software and related documentation is part of the // Computational Geometry Algorithms Library (CGAL). // -// file : include/CGAL/config/msvc7/CGAL/compiler_config.h -// package : wininst -// author(s) : install_cgal script -// release : -// release_date : +// release : CGAL-2.5-I-3 +// file : include/CGAL/config/i686_CYGWINNT-5.0-1.3.2_CL.EXE-1300/CGAL/compiler_config.h +// package : Installation (1.149) // -// coordinator : Radu Ursu -// ============================================================== - - - - -// Compiler specific configuration file for CGAL 2.4-I-83 +// Compiler specific configuration file for CGAL 2.5-I-3 // System: i686_CYGWINNT-5.0-1.3.2_CL.EXE-1300 // generated by install_cgal 1.149 // with install testsuite 1.11 @@ -56,6 +47,14 @@ //+-------------------------------------------------------------------------- #define CGAL_CFG_MATCHING_BUG_3 1 +//+-------------------------------------------------------------------------- +//| This is a test-case for a bug in VC++ 7.0 that redefines min(a, b) and max(a, b) +//| Files concerned: windows.h, windef.h +//| When the bug is present, CGAL_CFG_NOMINMAX_BUG is set +//| The file basic.h should check if this bug is present and if so, define NOMINMAX flag +//+-------------------------------------------------------------------------- +#define CGAL_CFG_NOMINMAX_BUG 1 + //+-------------------------------------------------------------------------- //| When template implementation files are not included in the source files, //| a compiler may attempt to find the unincluded template bodies