From ebc6c751ac19a293d0baca3b9c0e2643fb4b5136 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Sat, 1 Dec 2001 13:19:05 +0000
Subject: [PATCH] Defined BOOST_NO_VOID_RETURNS in MSVC 6 mode.

[SVN r11846]
---
 include/boost/config/compiler/comeau.hpp |  7 +++++++
 include/boost/config/compiler/intel.hpp  | 10 +++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/include/boost/config/compiler/comeau.hpp b/include/boost/config/compiler/comeau.hpp
index edcff490..24456461 100644
--- a/include/boost/config/compiler/comeau.hpp
+++ b/include/boost/config/compiler/comeau.hpp
@@ -15,6 +15,13 @@
 #     define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
 #     define BOOST_NO_SWPRINTF
 #  endif
+
+// Void returns don't work when emulating VC 6 (Peter Dimov)
+
+#  if defined(_MSC_VER) && (_MSC_VER <= 1200)
+#     define BOOST_NO_VOID_RETURNS
+#  endif
+
 #endif
 
 #define BOOST_COMPILER "Comeau compiler version " BOOST_STRINGIZE(__COMO_VERSION__)
diff --git a/include/boost/config/compiler/intel.hpp b/include/boost/config/compiler/intel.hpp
index 2b466f5c..a91a599d 100644
--- a/include/boost/config/compiler/intel.hpp
+++ b/include/boost/config/compiler/intel.hpp
@@ -23,7 +23,8 @@
 
 #if (BOOST_INTEL_CXX_VERSION <= 600) || !defined(BOOST_STRICT_CONFIG)
 
-#  if defined(_MSC_VER)
+#  if defined(_MSC_VER) && (_MSC_VER <= 1300) // added check for <= VC 7 (Peter Dimov)
+
       // Intel C++ 5.0.1 uses EDG 2.45, but fails to activate Koenig lookup
       // in the frontend even in "strict" mode, unless you use 
       // -Qoption,cpp,--arg_dep_lookup.  (reported by Kirk Klobe & Thomas Witt)
@@ -38,6 +39,13 @@
 #     define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
 #  endif
 
+// Void returns, 64 bit integrals don't work when emulating VC 6 (Peter Dimov)
+
+#  if defined(_MSC_VER) && (_MSC_VER <= 1200)
+#     define BOOST_NO_VOID_RETURNS
+#     define BOOST_NO_INTEGRAL_INT64_T
+#  endif
+
 #endif
 
 #ifdef _MSC_VER