Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Imported upstream 1.9.96

Signed-off-by: Stefan Naewe <stefan.naewe@atlas-elektronik.com>
  • Loading branch information...
commit ef87e6f037f186f0b703457fe68e2c004fcc246b 1 parent dc334a4
Stefan Naewe authored
View
3  AUTHORS.txt
@@ -2,7 +2,7 @@
STLSoft - Authors
; Created: 29th March 2002
-; Updated: 12th January 2010
+; Updated: 10th March 2010
============================================================================
@@ -84,6 +84,7 @@ Bug reports, fixes and suggestions (for which we are very grateful):
Volker Lukas
W�odzimierz Skiba
Yakov Markovitch
+ yozara
and many others who's posts and requests have been invaluable
View
29 CHANGES.txt
@@ -2,7 +2,7 @@
STLSoft - Changes
; Created: 29th March 2002
-; Updated: 7th March 2010
+; Updated: 10th March 2010
============================================================================
@@ -19,6 +19,33 @@ STLSoft - Changes
============================================================================
+Changes for 1.9.96 (10th March 2010)
+
+Summary:
+========
+
+ * Visual C++ 10 compatibility
+
+Changes:
+========
+
+ STLSoft:
+ ========
+
+ ~ include/stlsoft/internal/cccap/msvc.h:
+ + VC++ 10 compatibility
+
+ ~ include/stlsoft/stlsoft.h:
+ + Visual C++ 10 support
+
+ ~ include/stlsoft/util/std/iterator_helper.hpp:
+ + added support for Dinkumware 10 (as well as making explicit support for Dinkumware 8 & 9)
+
+ ~ include/stlsoft/util/std/library_discriminator.hpp:
+ ~ refactored Dinkumware detection, to discriminate 8, 9 and 10
+
+============================================================================
+
Changes for 1.9.95 (7th March 2010)
Summary:
View
8 HISTORY.txt
@@ -2,11 +2,17 @@
STLSoft - History
; Created: 29th March 2002
-; Updated: 7th March 2010
+; Updated: 10th March 2010
============================================================================
+10th March 2010 - 1.9.96 released
+---------------------------------
+
+ * Visual C++ 10 compatibility
+
+
7th March 2010 - 1.9.95 released
--------------------------------
View
12 INSTALL.txt
@@ -2,7 +2,7 @@
STLSoft - Install
; Created: 29th March 2002
-; Updated: 7th March 2010
+; Updated: 10th March 2010
============================================================================
@@ -11,16 +11,16 @@ STLSoft - Install
It is recommended that you define an STLSOFT environment variable.
For example, if you're using UNIX and you install
- to /usr/local/stlsoft/stlsoft-1.9.95 then you should set the environment
- variable STLSOFT to /usr/local/stlsoft/stlsoft-1.9.95 in which case the
+ to /usr/local/stlsoft/stlsoft-1.9.96 then you should set the environment
+ variable STLSOFT to /usr/local/stlsoft/stlsoft-1.9.96 in which case the
file stlsoft/stlsoft.h will be located in
$STLSOFT/include/stlsoft/stlsoft.h
Conversely, if you're using Windows and you intall
- to C:\3pty\STLSoft\stlsoft-1.9.95 then you should set the environment
- variable STLSoft to C:\3pty\STLSoft\stlsoft-1.9.95 in which case the
+ to C:\3pty\STLSoft\stlsoft-1.9.96 then you should set the environment
+ variable STLSoft to C:\3pty\STLSoft\stlsoft-1.9.96 in which case the
file stlsoft/stlsoft.h will be located in
- C:\3pty\STLSoft\stlsoft-1.9.95\stlsoft\stlsoft.h
+ C:\3pty\STLSoft\stlsoft-1.9.96\stlsoft\stlsoft.h
The makefiles / project files of several other open-source projects expect
this symbol, including:
View
4 NEWS.txt
@@ -2,13 +2,15 @@
STLSoft - News
; Created: 29th March 2002
-; Updated: 7th March 2010
+; Updated: 10th March 2010
============================================================================
News:
+ 10th March 2010 - Release of STLSoft 1.9.96
+
7th March 2010 - Release of STLSoft 1.9.95
5th March 2010 - Release of STLSoft 1.9.94
View
10 include/stlsoft/internal/cccap/msvc.h
@@ -4,7 +4,7 @@
* Purpose: Compiler feature discrimination for Visual C++.
*
* Created: 7th February 2003
- * Updated: 14th February 2010
+ * Updated: 9th March 2010
*
* Thanks: To Cláudio Albuquerque for working on the
* Win64-compatibility.
@@ -63,9 +63,9 @@
#ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION
# define STLSOFT_VER_H_STLSOFT_CCCAP_MSVC_MAJOR 3
-# define STLSOFT_VER_H_STLSOFT_CCCAP_MSVC_MINOR 20
-# define STLSOFT_VER_H_STLSOFT_CCCAP_MSVC_REVISION 3
-# define STLSOFT_VER_H_STLSOFT_CCCAP_MSVC_EDIT 114
+# define STLSOFT_VER_H_STLSOFT_CCCAP_MSVC_MINOR 21
+# define STLSOFT_VER_H_STLSOFT_CCCAP_MSVC_REVISION 1
+# define STLSOFT_VER_H_STLSOFT_CCCAP_MSVC_EDIT 115
#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */
/* /////////////////////////////////////////////////////////////////////////
@@ -607,7 +607,7 @@
/* */
#if ( _MSC_VER >= 1100 && \
_MSC_VER < 1310) || \
- _MSC_VER == 1500
+ _MSC_VER >= 1500
# define STLSOFT_CF_FUNCTION_SIGNATURE_FULL_ARG_QUALIFICATION_REQUIRED
#endif /* compiler */
View
19 include/stlsoft/stlsoft.h
@@ -6,7 +6,7 @@
* types.
*
* Created: 15th January 2002
- * Updated: 7th March 2010
+ * Updated: 10th March 2010
*
* Home: http://stlsoft.org/
*
@@ -53,9 +53,9 @@
/* File version */
#ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION
# define STLSOFT_VER_STLSOFT_H_STLSOFT_MAJOR 3
-# define STLSOFT_VER_STLSOFT_H_STLSOFT_MINOR 21
-# define STLSOFT_VER_STLSOFT_H_STLSOFT_REVISION 14
-# define STLSOFT_VER_STLSOFT_H_STLSOFT_EDIT 402
+# define STLSOFT_VER_STLSOFT_H_STLSOFT_MINOR 22
+# define STLSOFT_VER_STLSOFT_H_STLSOFT_REVISION 1
+# define STLSOFT_VER_STLSOFT_H_STLSOFT_EDIT 403
#else /* ? STLSOFT_DOCUMENTATION_SKIP_SECTION */
/* # include "./internal/doxygen_defs.h" */
#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */
@@ -257,13 +257,14 @@
# define _STLSOFT_VER_1_9_91 0x01095bff /*!< Version 1.9.91 (30th January 2010) */
# define _STLSOFT_VER_1_9_92 0x01095cff /*!< Version 1.9.92 (11th February 2010) */
# define _STLSOFT_VER_1_9_93 0x01095dff /*!< Version 1.9.93 (14th February 2010) */
-# define _STLSOFT_VER_1_9_95 0x01095fff /*!< Version 1.9.93 (7th March 2010) */
+# define _STLSOFT_VER_1_9_95 0x01095fff /*!< Version 1.9.95 (7th March 2010) */
+# define _STLSOFT_VER_1_9_96 0x01096fff /*!< Version 1.9.96 (10th March 2010) */
#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */
#define _STLSOFT_VER_MAJOR 1
#define _STLSOFT_VER_MINOR 9
-#define _STLSOFT_VER_REVISION 95
-#define _STLSOFT_VER _STLSOFT_VER_1_9_95
+#define _STLSOFT_VER_REVISION 96
+#define _STLSOFT_VER _STLSOFT_VER_1_9_96
/* /////////////////////////////////////////////////////////////////////////
* Basic macros
@@ -625,8 +626,10 @@
# define STLSOFT_COMPILER_VERSION_STRING "Visual C++ 8.0"
# elif (_MSC_VER == 1500)
# define STLSOFT_COMPILER_VERSION_STRING "Visual C++ 9.0"
+# elif (_MSC_VER == 1600)
+# define STLSOFT_COMPILER_VERSION_STRING "Visual C++ 10.0"
# else /* ? _MSC_VER */
-# error Currently only versions 5.0, 6.0, 7.0, 7.1, 8.0 and 9.0 of the Visual C++ compiler are supported by the STLSoft libraries
+# error Currently only versions 5.0, 6.0, 7.0, 7.1, 8.0, 9.0 and 10.0 of the Visual C++ compiler are supported by the STLSoft libraries
# endif /* _MSC_VER */
#else /* ? compiler */
View
25 include/stlsoft/util/std/iterator_helper.hpp
@@ -5,7 +5,7 @@
* abstracting away standard library inconsistencies.
*
* Created: 2nd January 2000
- * Updated: 6th January 2010
+ * Updated: 9th March 2010
*
* Home: http://stlsoft.org/
*
@@ -51,9 +51,9 @@
#ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION
# define STLSOFT_VER_STLSOFT_UTIL_STD_HPP_ITERATOR_HELPER_MAJOR 5
-# define STLSOFT_VER_STLSOFT_UTIL_STD_HPP_ITERATOR_HELPER_MINOR 2
-# define STLSOFT_VER_STLSOFT_UTIL_STD_HPP_ITERATOR_HELPER_REVISION 2
-# define STLSOFT_VER_STLSOFT_UTIL_STD_HPP_ITERATOR_HELPER_EDIT 108
+# define STLSOFT_VER_STLSOFT_UTIL_STD_HPP_ITERATOR_HELPER_MINOR 3
+# define STLSOFT_VER_STLSOFT_UTIL_STD_HPP_ITERATOR_HELPER_REVISION 1
+# define STLSOFT_VER_STLSOFT_UTIL_STD_HPP_ITERATOR_HELPER_EDIT 109
#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */
/* /////////////////////////////////////////////////////////////////////////
@@ -423,8 +423,14 @@ namespace stlsoft
/* Borland C++ + Dinkumware */
# define STLSOFT_ITERATOR_REVERSE_ITERATOR_FORM1_SUPPORT
# elif defined(STLSOFT_CF_STD_LIBRARY_IS_DINKUMWARE_VC) && \
- ( STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION == STLSOFT_CF_DINKUMWARE_VC_VERSION_7_0 || \
- STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION == STLSOFT_CF_DINKUMWARE_VC_VERSION_7_1)
+ ( \
+ STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION == STLSOFT_CF_DINKUMWARE_VC_VERSION_7_0 || \
+ STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION == STLSOFT_CF_DINKUMWARE_VC_VERSION_7_1 || \
+ STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION == STLSOFT_CF_DINKUMWARE_VC_VERSION_8_0 || \
+ STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION == STLSOFT_CF_DINKUMWARE_VC_VERSION_9_0 || \
+ STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION == STLSOFT_CF_DINKUMWARE_VC_VERSION_10_0 || \
+ 0 \
+ )
/* Visual C++ + Dinkumware */
# define STLSOFT_ITERATOR_REVERSE_ITERATOR_FORM1_SUPPORT
# endif /* compiler / library */
@@ -441,9 +447,12 @@ namespace stlsoft
/* Form 3 */
# if defined(STLSOFT_CF_STD_LIBRARY_IS_DINKUMWARE_VC) && \
- ( STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION == STLSOFT_CF_DINKUMWARE_VC_VERSION_4_2 || \
+ ( \
+ STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION == STLSOFT_CF_DINKUMWARE_VC_VERSION_4_2 || \
STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION == STLSOFT_CF_DINKUMWARE_VC_VERSION_5_0 || \
- STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION == STLSOFT_CF_DINKUMWARE_VC_VERSION_6_0)
+ STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION == STLSOFT_CF_DINKUMWARE_VC_VERSION_6_0 || \
+ 0 \
+ )
/* Visual C++ + Dinkumware */
# define STLSOFT_ITERATOR_REVERSE_ITERATOR_FORM3_SUPPORT
# endif /* compiler / library */
View
168 include/stlsoft/util/std/library_discriminator.hpp
@@ -4,11 +4,11 @@
* Purpose: Discriminates between standard library implementations
*
* Created: 2nd January 2000
- * Updated: 10th August 2009
+ * Updated: 9th March 2010
*
* Home: http://stlsoft.org/
*
- * Copyright (c) 2000-2009, Matthew Wilson and Synesis Software
+ * Copyright (c) 2000-2010, Matthew Wilson and Synesis Software
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -50,9 +50,9 @@
#ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION
# define STLSOFT_VER_STLSOFT_UTIL_STD_LIBRARY_DISCRIMINATOR_MAJOR 4
-# define STLSOFT_VER_STLSOFT_UTIL_STD_LIBRARY_DISCRIMINATOR_MINOR 5
+# define STLSOFT_VER_STLSOFT_UTIL_STD_LIBRARY_DISCRIMINATOR_MINOR 6
# define STLSOFT_VER_STLSOFT_UTIL_STD_LIBRARY_DISCRIMINATOR_REVISION 1
-# define STLSOFT_VER_STLSOFT_UTIL_STD_LIBRARY_DISCRIMINATOR_EDIT 100
+# define STLSOFT_VER_STLSOFT_UTIL_STD_LIBRARY_DISCRIMINATOR_EDIT 101
#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */
/* /////////////////////////////////////////////////////////////////////////
@@ -115,8 +115,8 @@ namespace stlsoft
* of the dinkumware libraries:
*
* VC++ 4.2: use_ansi.h, utility { use_ansi.h, iosfwd { use_ansi.h, cstdio { stdio.h }, cstring { string.h }, cwchar { wchar.h }, xstddef { yvals.h, cstddef { stddef.h } } } }
- * VC++ 5.0: utility { iosfwd { cstdio, cstring, cwchar, xstddef { yvals.h, cstddef } } }
- * VC++ 6.0: utility { iosfwd { cstdio, cstring, cwchar, xstddef { yvals.h, cstddef } } }
+ * VC++ 5: utility { iosfwd { cstdio, cstring, cwchar, xstddef { yvals.h, cstddef } } }
+ * VC++ 6: utility { iosfwd { cstdio, cstring, cwchar, xstddef { yvals.h, cstddef } } }
* VC++ 7.0: xutility { climits, utility { iosfwd { cstdio, cstring, cwchar, xstddef { yvals.h, cstddef } } }
* VC++ 7.1: xutility { climits, utility { iosfwd { cstdio, cstring, cwchar, xstddef { yvals.h, cstddef } } }
*
@@ -244,20 +244,24 @@ namespace stlsoft
# error Standard library implementation not recognised
#endif /* various "unique" macros */
-/* Detecting presence of Dinkumware is easy. Now comes the fun when we need to differentiate
- * between versions of the library, because there is no version information contained in any
- * of the headers, which is helpful.
+/* Detecting presence of Dinkumware is easy. Now comes the fun when we need
+ * to differentiate between versions of the library, because there is no
+ * version information contained in any of the headers, which is helpful.
*
- * _STCONS is in 5.0, 6.0, 7.0, 7.1, but is not in 4.2
- * _TEMPLATE_MEMBER is in 7.0, but not in 4.2, 5.0, 6.0, 7.1
- * _TEMPLATE is in 7.0, but not in 4.2, 5.0, 6.0, 7.1
- * _MESG is in 7.0 and 7.1, but not in 4.2, 5.0, 5.6
+ * _STCONS in 5, 6, 7.0, 7.1, 8, 9, 10
+ * _TEMPLATE_MEMBER in 7.0
+ * _TEMPLATE in 7.0
+ * _MESG in 7.0, 7.1, 8, 9
+ * _HAS_EXCEPTIONS in 7.0, 7.1, 8, 9, 10
+ * _EMPTY_ARGUMENT in 8, 9, 10
+ * _THROWS in 9, 10
+ * _IS_YES in 10
*
- * _XTREE_ is in 6.0, 7.0, 7.1, but not in 4.2, 5.0. Of course, this means including it, which is a PITA!
+ * _XTREE_ is in 6, 7.0, 7.1, but not in 4.2, 5. Of course, this means including it, which is a PITA!
*
- * _INC_ASSERT (from assert.h) is in 6.0, but not in 4.2, 5.0, 7.0, 7.1. This one is even
- * dodgier than the rest, since if _STLSOFT_NO_ASSERT is specified, asserts will not even
- * be included.
+ * _INC_ASSERT (from assert.h) is in 6, but not in 4.2, 5, 7.0, 7.1. This
+ * one is even dodgier than the rest, since if _STLSOFT_NO_ASSERT is
+ * specified, asserts will not even be included.
*/
#ifdef STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION
@@ -270,6 +274,9 @@ namespace stlsoft
#define STLSOFT_CF_DINKUMWARE_VC_VERSION_6_0 (0x0600)
#define STLSOFT_CF_DINKUMWARE_VC_VERSION_7_0 (0x0700)
#define STLSOFT_CF_DINKUMWARE_VC_VERSION_7_1 (0x0701)
+#define STLSOFT_CF_DINKUMWARE_VC_VERSION_8_0 (0x0800)
+#define STLSOFT_CF_DINKUMWARE_VC_VERSION_9_0 (0x0900)
+#define STLSOFT_CF_DINKUMWARE_VC_VERSION_10_0 (0x0a00)
#ifdef STLSOFT_CF_STD_LIBRARY_IS_DINKUMWARE_VC
# if defined(STLSOFT_COMPILER_IS_INTEL) && \
@@ -281,32 +288,131 @@ namespace stlsoft
# error When the Dinkumware-VC library is used, STLSoft requires that Visual C++ or a compatible compiler (e.g. DMC++, Comeau, CodeWarrior, Intel) is used
# endif /* compiler */
-# if !defined(_STCONS)
- /* Version 4.2 */
-# define STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION STLSOFT_CF_DINKUMWARE_VC_VERSION_4_2
-# elif defined(_TEMPLATE_MEMBER) && \
- defined(_TEMPLATE)
- /* Version 7.0 */
-# define STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION STLSOFT_CF_DINKUMWARE_VC_VERSION_7_0
-# elif defined(_MESG)
+# if \
+ defined(_STCONS) && \
+ !defined(_TEMPLATE_MEMBER) && \
+ !defined(_TEMPLATE) && \
+ !defined(_MESG) && \
+ defined(_HAS_EXCEPTIONS) && \
+ defined(_EMPTY_ARGUMENT) && \
+ defined(_THROWS) && \
+ defined(_IS_YES)
+ /* Version 10 */
+# ifdef _STLSOFT_COMPILE_VERBOSE
+# pragma message(" Dinkumware version 10")
+# endif /* _STLSOFT_COMPILE_VERBOSE */
+# define STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION STLSOFT_CF_DINKUMWARE_VC_VERSION_10_0
+
+# elif \
+ defined(_STCONS) && \
+ !defined(_TEMPLATE_MEMBER) && \
+ !defined(_TEMPLATE) && \
+ defined(_MESG) && \
+ defined(_HAS_EXCEPTIONS) && \
+ defined(_EMPTY_ARGUMENT) && \
+ defined(_THROWS) && \
+ !defined(_IS_YES)
+ /* Version 9 */
+# ifdef _STLSOFT_COMPILE_VERBOSE
+# pragma message(" Dinkumware version 9")
+# endif /* _STLSOFT_COMPILE_VERBOSE */
+# define STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION STLSOFT_CF_DINKUMWARE_VC_VERSION_9_0
+
+# elif \
+ defined(_STCONS) && \
+ !defined(_TEMPLATE_MEMBER) && \
+ !defined(_TEMPLATE) && \
+ defined(_MESG) && \
+ defined(_HAS_EXCEPTIONS) && \
+ defined(_EMPTY_ARGUMENT) && \
+ !defined(_THROWS) && \
+ !defined(_IS_YES)
+ /* Version 8 */
+# ifdef _STLSOFT_COMPILE_VERBOSE
+# pragma message(" Dinkumware version 8")
+# endif /* _STLSOFT_COMPILE_VERBOSE */
+# define STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION STLSOFT_CF_DINKUMWARE_VC_VERSION_8_0
+
+# elif \
+ defined(_STCONS) && \
+ !defined(_TEMPLATE_MEMBER) && \
+ !defined(_TEMPLATE) && \
+ defined(_MESG) && \
+ defined(_HAS_EXCEPTIONS) && \
+ !defined(_EMPTY_ARGUMENT) && \
+ !defined(_THROWS) && \
+ !defined(_IS_YES)
/* Version 7.1 */
+# ifdef _STLSOFT_COMPILE_VERBOSE
+# pragma message(" Dinkumware version 7.1")
+# endif /* _STLSOFT_COMPILE_VERBOSE */
# define STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION STLSOFT_CF_DINKUMWARE_VC_VERSION_7_1
-# elif defined(_STCONS)
- /* Version 5.0 or 6.0
+
+# elif \
+ defined(_STCONS) && \
+ defined(_TEMPLATE_MEMBER) && \
+ defined(_TEMPLATE) && \
+ defined(_MESG) && \
+ defined(_HAS_EXCEPTIONS) && \
+ !defined(_EMPTY_ARGUMENT) && \
+ !defined(_THROWS) && \
+ !defined(_IS_YES)
+ /* Version 7.0 */
+# ifdef _STLSOFT_COMPILE_VERBOSE
+# pragma message(" Dinkumware version 7.0")
+# endif /* _STLSOFT_COMPILE_VERBOSE */
+# define STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION STLSOFT_CF_DINKUMWARE_VC_VERSION_7_0
+
+# elif \
+ !defined(_STCONS) && \
+ !defined(_TEMPLATE_MEMBER) && \
+ !defined(_TEMPLATE) && \
+ !defined(_MESG) && \
+ !defined(_HAS_EXCEPTIONS) && \
+ !defined(_EMPTY_ARGUMENT) && \
+ !defined(_THROWS) && \
+ !defined(_IS_YES)
+ /* Version 4.2 */
+# ifdef _STLSOFT_COMPILE_VERBOSE
+# pragma message(" Dinkumware version 4.2")
+# endif /* _STLSOFT_COMPILE_VERBOSE */
+# define STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION STLSOFT_CF_DINKUMWARE_VC_VERSION_4_2
+
+# elif\
+ defined(_STCONS) && \
+ !defined(_TEMPLATE_MEMBER) && \
+ !defined(_TEMPLATE) && \
+ !defined(_MESG) && \
+ !defined(_HAS_EXCEPTIONS) && \
+ !defined(_EMPTY_ARGUMENT) && \
+ !defined(_THROWS) && \
+ !defined(_IS_YES)
+ /* Versions 5 or 6
*
* Need to skip out of the STLSoft namespace, then #include <xtree>, skip back in and then
* test for
*/
+# if _MSC_VER < 1100 || \
+ _MSC_VER > 1200
+# error Dinkumware library version discrimination failed
+# endif /* 1100 <= _MSC_VER < = 1200 */
+
# ifndef _STLSOFT_NO_NAMESPACE
} // namespace stlsoft
# endif /* _STLSOFT_NO_NAMESPACE */
# include <xtree>
# if defined(_XTREE_)
- /* Version 6.0 */
+ /* Version 6 */
+ # ifdef _STLSOFT_COMPILE_VERBOSE
+# pragma message(" Dinkumware version 6")
+ # endif /* _STLSOFT_COMPILE_VERBOSE */
# define STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION STLSOFT_CF_DINKUMWARE_VC_VERSION_6_0
# elif defined(_TREE_)
- /* Version 5.0 */
+ /* Version 5 */
+ # ifdef _STLSOFT_COMPILE_VERBOSE
+# pragma message(" Dinkumware version 5")
+ # endif /* _STLSOFT_COMPILE_VERBOSE */
# define STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION STLSOFT_CF_DINKUMWARE_VC_VERSION_5_0
# else
# error Does not appear to be either the VC5 or VC6 Dinkumware library
@@ -316,11 +422,13 @@ namespace stlsoft
{
# endif /* _STLSOFT_NO_NAMESPACE */
# else
+# ifdef _STLSOFT_COMPILE_VERBOSE
+# pragma message(" Dinkumware version unknown")
+# endif /* _STLSOFT_COMPILE_VERBOSE */
# define STLSOFT_CF_STD_LIBRARY_DINKUMWARE_VC_VERSION STLSOFT_CF_DINKUMWARE_VC_VERSION_UNKNOWN
# endif /* VC++ version */
#endif /* STLSOFT_CF_STD_LIBRARY_IS_DINKUMWARE_VC */
-
/* /////////////////////////////////////////////////////////////////////////
* Tested compatibilities
*/
Please sign in to comment.
Something went wrong with that request. Please try again.