You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by fa...@apache.org on 2007/10/26 19:56:47 UTC
svn commit: r588724 - in /incubator/stdcxx/branches/4.2.x: include/
include/loc/ include/rw/ src/
Author: faridz
Date: Fri Oct 26 10:56:46 2007
New Revision: 588724
URL: http://svn.apache.org/viewvc?rev=588724&view=rev
Log:
2007-10-26 Farid Zaripov <fa...@epam.com>
STDCXX-437
* include/list [_MSC_VER < 1300]: Remove MSVC 6.0 specific code.
* include/loc/_locale.h: Ditto.
* include/map: Ditto.
* include/rw/_config-msvc.h: Ditto.
* include/rw/_config-msvcrt.h: Ditto.
* include/rw/_defs.h: Ditto.
* include/rw/_tree.h: Ditto.
* include/set: Ditto.
* include/string: Ditto.
* include/vector: Ditto.
* src/exception.cpp: Ditto.
* src/ti_ios.cpp: Ditto.
* src/ti_wios.cpp: Ditto.
Modified:
incubator/stdcxx/branches/4.2.x/include/list
incubator/stdcxx/branches/4.2.x/include/loc/_locale.h
incubator/stdcxx/branches/4.2.x/include/map
incubator/stdcxx/branches/4.2.x/include/rw/_config-msvc.h
incubator/stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h
incubator/stdcxx/branches/4.2.x/include/rw/_defs.h
incubator/stdcxx/branches/4.2.x/include/rw/_tree.h
incubator/stdcxx/branches/4.2.x/include/set
incubator/stdcxx/branches/4.2.x/include/string
incubator/stdcxx/branches/4.2.x/include/vector
incubator/stdcxx/branches/4.2.x/src/exception.cpp
incubator/stdcxx/branches/4.2.x/src/ti_ios.cpp
incubator/stdcxx/branches/4.2.x/src/ti_wios.cpp
Modified: incubator/stdcxx/branches/4.2.x/include/list
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/list?rev=588724&r1=588723&r2=588724&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/list (original)
+++ incubator/stdcxx/branches/4.2.x/include/list Fri Oct 26 10:56:46 2007
@@ -394,8 +394,6 @@
_C_init (__n, __x);
}
-#if !defined (_MSC_VER) || _MSC_VER >= 1300
-
template<class _InputIterator>
void _C_init (_InputIterator __first, _InputIterator __last, void*) {
_RWSTD_ASSERT_RANGE (__first, __last);
@@ -418,28 +416,6 @@
_C_init (__first, __last, _RWSTD_DISPATCH (_InputIterator));
}
-#else // if _MSC_VER < 1300
-
- list (const_iterator __first, const_iterator __last,
- const allocator_type& __alloc = allocator_type ())
- : allocator_type (__alloc), _RWSTD_NODE_BUFFER_INIT(0,0)
- _C_next_avail (0), _C_last (0), _C_node (0), _C_length (0) {
- _RWSTD_ASSERT_RANGE (__first, __last);
- _C_init();
- _RWSTD_LIST_INSERT_RANGE (begin (), __first, __last);
- }
-
- list (const_pointer __first, const_pointer __last,
- const allocator_type& __alloc = allocator_type ())
- : allocator_type (__alloc), _RWSTD_NODE_BUFFER_INIT(0,0)
- _C_next_avail (0), _C_last (0), _C_node (0), _C_length (0) {
- _RWSTD_ASSERT_RANGE (__first, __last);
- _C_init();
- _RWSTD_LIST_INSERT_RANGE (begin (), __first, __last);
- }
-
-#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
-
list (const list &__rhs)
: allocator_type(__rhs.get_allocator()), _RWSTD_NODE_BUFFER_INIT(0,0)
_C_next_avail (0), _C_last (0), _C_node (0), _C_length (0) {
@@ -451,8 +427,6 @@
list& operator= (const list&);
-#if !defined (_MSC_VER) || _MSC_VER >= 1300
-
template<class _InputIterator>
void assign (_InputIterator __first, _InputIterator __last) {
_RWSTD_ASSERT_RANGE (__first, __last);
@@ -467,29 +441,6 @@
insert (begin (), __n, __val);
}
-#else // if _MSC_VER < 1300
-
- void assign (const_iterator __first, const_iterator __last) {
- _RWSTD_ASSERT_RANGE (__first, __last);
-
- clear ();
- insert (begin (), __first, __last);
- }
-
- void assign (const_pointer __first, const_pointer __last) {
- _RWSTD_ASSERT_RANGE (__first, __last);
-
- clear ();
- insert (begin (), __first, __last);
- }
-
- void assign (size_type __n, const_reference __val) {
- clear ();
- insert (begin (), __n, __val);
- }
-
-#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
-
allocator_type get_allocator () const {
return *this;
}
@@ -586,8 +537,6 @@
iterator insert (iterator __it, const_reference __x);
-#if !defined (_MSC_VER) || _MSC_VER >= 1300
-
// handles nonintegral types
template<class _InputIterator>
void _C_insert (const iterator &__it,
@@ -624,25 +573,6 @@
_C_insert (__it, __n, __val);
}
-
-#else // if _MSC_VER < 1300
-
- void insert (iterator __it, size_type __n, const_reference __x) {
- _RWSTD_ASSERT_RANGE (begin (), __it);
-
- _C_insert (__it, __n, __x);
- }
-
- void insert (iterator __it, const_pointer __first, const_pointer __last) {
- _RWSTD_LIST_SAFE_INSERT_RANGE (__it, __first, __last);
- }
-
- void insert (iterator __it,
- const_iterator __first, const_iterator __last) {
- _RWSTD_LIST_SAFE_INSERT_RANGE (__it, __first, __last);
- }
-
-#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
iterator erase (iterator);
Modified: incubator/stdcxx/branches/4.2.x/include/loc/_locale.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/loc/_locale.h?rev=588724&r1=588723&r2=588724&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/loc/_locale.h (original)
+++ incubator/stdcxx/branches/4.2.x/include/loc/_locale.h Fri Oct 26 10:56:46 2007
@@ -288,13 +288,12 @@
_RW::__rw_locale *_C_body; // reference-counted body
-#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x540 \
- || defined (_MSC_VER) && _MSC_VER < 1300
+#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x540
// working around a SunPro member access control bug (see PR #25910)
public:
-#endif // SunPro <= 5.4 || MSVC <= 6.0
+#endif // SunPro <= 5.4
// (try to) retrieve a facet from a locale given an id
// may initialize the id if it isn't initialized yet
Modified: incubator/stdcxx/branches/4.2.x/include/map
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/map?rev=588724&r1=588723&r2=588724&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/map (original)
+++ incubator/stdcxx/branches/4.2.x/include/map Fri Oct 26 10:56:46 2007
@@ -123,9 +123,6 @@
const allocator_type &__alloc = allocator_type ())
: _C_rep (__cmp, __alloc) { }
-
-#if !defined (_MSC_VER) || _MSC_VER >= 1300
-
// 23.3.1.1, p3
template <class _InputIter>
map (_InputIter __first, _InputIter __last,
@@ -133,21 +130,6 @@
const _Allocator& __alloc = _Allocator ())
: _C_rep (__first, __last, __cmp, __alloc, false) { }
-#else // if _MSC_VER < 1300
-
- map (const value_type* __first, const value_type* __last,
- const key_compare &__cmp = key_compare (),
- const allocator_type &__alloc = allocator_type ())
- : _C_rep (__first, __last, __cmp, __alloc, false) { }
-
- map (const_iterator __first, const_iterator __last,
- const key_compare &__cmp = key_compare (),
- const allocator_type &__alloc = allocator_type ())
- : _C_rep (__first, __last, __cmp, __alloc, false) { }
-
-#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
-
-
map (const map &__rhs): _C_rep (__rhs._C_rep) { /* empty */ }
map& operator= (const map &__rhs) {
@@ -216,26 +198,11 @@
return _C_rep.insert (__it, __x, false);
}
-#if !defined (_MSC_VER) || _MSC_VER >= 1300
-
template<class _InputIter>
void insert (_InputIter __first, _InputIter __last) {
_C_rep.insert (__first, __last, false);
}
-#else // if _MSC_VER < 1300
-
- void insert (const value_type* __first, const value_type* __last) {
- _C_rep.insert (__first, __last, false);
- }
-
- void insert (const_iterator __first, const_iterator __last) {
- _C_rep.insert (__first, __last, false);
- }
-
-#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
-
-
void erase (iterator __it) {
_C_rep.erase (__it);
}
@@ -362,29 +329,12 @@
const allocator_type &__alloc = allocator_type ())
: _C_rep (__cmp, __alloc) { }
-#if !defined (_MSC_VER) || _MSC_VER >= 1300
-
template<class _InputIter>
multimap (_InputIter __first, _InputIter __last,
const _Compare& __cmp = _Compare (),
const _Allocator& __alloc = _Allocator ())
: _C_rep (__first, __last, __cmp, __alloc, true) { }
-#else // if _MSC_VER < 1300
-
- multimap (const value_type* __first, const value_type* __last,
- const key_compare &__cmp = key_compare (),
- const allocator_type &__alloc = allocator_type ())
- : _C_rep (__first, __last, __cmp, __alloc, true) { }
-
- multimap (const_iterator __first, const_iterator __last,
- const key_compare &__cmp = key_compare (),
- const allocator_type &__alloc = allocator_type ())
- : _C_rep (__first, __last, __cmp, __alloc, true) { }
-
-#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
-
-
multimap (const multimap &__rhs)
: _C_rep (__rhs._C_rep) { }
@@ -448,25 +398,10 @@
return _C_rep.insert (__it, __x, true);
}
-#if !defined (_MSC_VER) || _MSC_VER >= 1300
-
template<class _InputIter>
void insert (_InputIter __first, _InputIter __last) {
_C_rep.insert (__first, __last, true);
}
-
-#else // if _MSC_VER < 1300
-
- void insert (const value_type* __first, const value_type* __last) {
- _C_rep.insert (__first, __last, true);
- }
-
- void insert (const_iterator __first, const_iterator __last) {
- _C_rep.insert (__first, __last, true);
- }
-
-#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
-
void erase (iterator __it) {
_C_rep.erase (__it);
Modified: incubator/stdcxx/branches/4.2.x/include/rw/_config-msvc.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/rw/_config-msvc.h?rev=588724&r1=588723&r2=588724&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/rw/_config-msvc.h (original)
+++ incubator/stdcxx/branches/4.2.x/include/rw/_config-msvc.h Fri Oct 26 10:56:46 2007
@@ -48,16 +48,6 @@
# endif // _RWSTD_NO_STRING_NPOS_TYPE
#endif // MSVC <= 7.0
-#if _MSC_VER <= 1200 // MSVC <= 6.0
-# define _RWSTD_NO_TYPENAME
-
-#ifndef _RWSTD_NO_EXPORT
- // not implemented
-# define _RWSTD_NO_EXPORT
-#endif // _RWSTD_NO_EXPORT
-
-#endif // MSVC <= 6.0
-
// disable "Same type qualifier used more than once"
# pragma warning (disable: 4114)
Modified: incubator/stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h?rev=588724&r1=588723&r2=588724&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h (original)
+++ incubator/stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h Fri Oct 26 10:56:46 2007
@@ -35,100 +35,6 @@
# define _RWSTD_NO_STATIC_DEF3
#endif // MSVC <= 7.0
-#if _MSC_VER <= 1200 // MSVC <= 6.0
-
-// static data members of class templates aren't properly collapsed
-// (compiler emits one copy per each translation unit that contains
-// the definition of the template member, and the linker fails to
-// multiple copies that reside in shared libraries)
-#ifndef _RWSTD_NO_COLLAPSE_TEMPLATE_STATICS
-# define _RWSTD_NO_COLLAPSE_TEMPLATE_STATICS
-#endif // _RWSTD_NO_COLLAPSE_TEMPLATE_STATICS
-
-#define _RWSTD_NO_NL_LANGINFO
-
-#if defined _RWSTD_NO_NEW_HEADER
-# undef _RWSTD_NO_NEW_HEADER
-#endif // _RWSTD_NO_NEW_HEADER
-
-// not declared/defined in libc
-#if !defined (_RWSTD_NO_STRTOLL_IN_LIBC)
-# define _RWSTD_NO_STRTOLL_IN_LIBC
-#endif // _RWSTD_NO_STRTOLL_IN_LIBC
-
-#if !defined (_RWSTD_NO_STRTOULL_IN_LIBC)
-# define _RWSTD_NO_STRTOULL_IN_LIBC
-#endif // _RWSTD_NO_STRTOULL_IN_LIBC
-
- // functions are defined in MSVC's msvcprt.lib and msvcprtd.lib
- // which include the compiler's implementation of the C++ Standard
- // library and with which we (obviously) cannot use
-#ifndef _RWSTD_NO_WCTOB
-# define _RWSTD_NO_WCTOB
-#endif // _RWSTD_NO_WCTOB
-
-#ifndef _RWSTD_NO_WCTOB_IN_LIBC
-# define _RWSTD_NO_WCTOB_IN_LIBC
-#endif // _RWSTD_NO_WCTOB_IN_LIBC
-
-#ifndef _RWSTD_NO_MBRTOWC
-# define _RWSTD_NO_MBRTOWC
-#endif // _RWSTD_NO_MBRTOWC
-
-#ifndef _RWSTD_NO_MBRTOWC_IN_LIBC
-# define _RWSTD_NO_MBRTOWC_IN_LIBC
-#endif // _RWSTD_NO_MBRTOWC_IN_LIBC
-
-#ifndef _RWSTD_NO_WCRTOMB
-# define _RWSTD_NO_WCRTOMB
-#endif // _RWSTD_NO_WCRTOMB
-
-#ifndef _RWSTD_NO_WCRTOMB_IN_LIBC
-# define _RWSTD_NO_WCRTOMB_IN_LIBC
-#endif // _RWSTD_NO_WCRTOMB_IN_LIBC
-
-#ifndef _RWSTD_NO_MBSTOWCS
-# define _RWSTD_NO_MBSTOWCS
-#endif // _RWSTD_NO_MBSTOWCS
-
-#ifndef _RWSTD_NO_MBSTOWCS_IN_LIBC
-# define _RWSTD_NO_MBSTOWCS_IN_LIBC
-#endif // _RWSTD_NO_MBSTOWCS_IN_LIBC
-
-#ifndef _RWSTD_NO_MBRLEN
-# define _RWSTD_NO_MBRLEN
-#endif // _RWSTD_NO_MBRLEN
-
-#ifndef _RWSTD_NO_MBRLEN_IN_LIBC
-# define _RWSTD_NO_MBRLEN_IN_LIBC
-#endif // _RWSTD_NO_MBRLEN_IN_LIBC
-
-#ifndef _RWSTD_NO_WCSRTOMBS
-# define _RWSTD_NO_WCSRTOMBS
-#endif // _RWSTD_NO_WCSRTOMBS
-
-#ifndef _RWSTD_NO_WCSRTOMBS_IN_LIBC
-# define _RWSTD_NO_WCSRTOMBS_IN_LIBC
-#endif // _RWSTD_NO_WCSRTOMBS_IN_LIBC
-
-#ifndef _RWSTD_NO_BTOWC
-# define _RWSTD_NO_BTOWC
-#endif // _RWSTD_NO_BTOWC
-
-#ifndef _RWSTD_NO_BTOWC_IN_LIBC
-# define _RWSTD_NO_BTOWC_IN_LIBC
-#endif // _RWSTD_NO_BTOWC_IN_LIBC
-
-#ifndef _RWSTD_NO_MBSRTOWCS
-# define _RWSTD_NO_MBSRTOWCS
-#endif // _RWSTD_NO_MBSRTOWCS
-
-#ifndef _RWSTD_NO_MBSRTOWCS_IN_LIBC
-# define _RWSTD_NO_MBSRTOWCS_IN_LIBC
-#endif // _RWSTD_NO_MBSRTOWCS_IN_LIBC
-
-#endif // MSVC <= 6.0
-
// enable the <cxxx> form of libc headers
// we can only use the rw version in include/ansi
#ifndef _RWSTD_NO_PURE_C_HEADERS
Modified: incubator/stdcxx/branches/4.2.x/include/rw/_defs.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/rw/_defs.h?rev=588724&r1=588723&r2=588724&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/rw/_defs.h (original)
+++ incubator/stdcxx/branches/4.2.x/include/rw/_defs.h Fri Oct 26 10:56:46 2007
@@ -481,13 +481,8 @@
# define _RWSTD_EXPORT __declspec (dllimport)
# endif // _RWSTD_LIB_SRC
-# if _MSC_VER >= 1300
# define _RWSTD_CLASS_EXPORT _RWSTD_EXPORT
# define _RWSTD_MEMBER_EXPORT /* empty */
-# else // if MSVC < 7.0
-# define _RWSTD_CLASS_EXPORT /* empty */
-# define _RWSTD_MEMBER_EXPORT _RWSTD_EXPORT
-# endif // MSVC >= 7.0
// disable warnings:
// C4251: class needs to have dll-interface to be used by cliens
@@ -635,8 +630,7 @@
// If compiler supports member and default templates then it supports
// the _RWSTD_ALLOCATOR
//
-#if !defined (_RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#ifndef _RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES
# define _RWSTD_ALLOCATOR
#endif
Modified: incubator/stdcxx/branches/4.2.x/include/rw/_tree.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/rw/_tree.h?rev=588724&r1=588723&r2=588724&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/rw/_tree.h (original)
+++ incubator/stdcxx/branches/4.2.x/include/rw/_tree.h Fri Oct 26 10:56:46 2007
@@ -152,15 +152,11 @@
__rw_tree_iter (const _C_iterator &__rhs)
: _C_node (__rhs._C_node) { }
-#if !defined (_MSC_VER) || _MSC_VER >= 1300
-
template <class _Ptr, class _Ref>
__rw_tree_iter (const __rw_tree_iter<_TypeT, _DiffT, _Ptr, _Ref, _Node>&
__rhs)
: _C_node (__rhs._C_node) { }
-#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
-
__rw_tree_iter (_C_link_t __lnk)
: _C_node (__lnk) {}
@@ -472,8 +468,6 @@
__rb_tree (const key_compare& = key_compare (),
const allocator_type& = allocator_type ());
-#if !defined (_MSC_VER) || _MSC_VER >= 1300
-
template<class _InputIter>
__rb_tree (_InputIter __first, _InputIter __last,
const key_compare &__cmp,
@@ -493,46 +487,6 @@
}
}
-#else // if _MSC_VER < 1300
-
- __rb_tree (const value_type* __first, const value_type* __last,
- const key_compare& __cmp,
- const allocator_type& __alloc, bool __dup)
- : allocator_type (__alloc), _C_buf_list (0),
- _C_end (0), _C_size (0),
- _C_cmp (__cmp) {
-
- _C_init ();
-
- _TRY {
- insert (__first, __last, __dup);
- }
- _CATCH (...) {
- _C_deallocate_buffers ();
- _RETHROW;
- }
- }
-
- __rb_tree (const_iterator __first, const_iterator __last,
- const key_compare &__cmp,
- const allocator_type& __alloc, bool __dup)
- : allocator_type (__alloc), _C_buf_list (0),
- _C_end (0), _C_size (0),
- _C_cmp (__cmp) {
-
- _C_init ();
-
- _TRY {
- insert (__first, __last, __dup);
- }
- _CATCH (...) {
- _C_deallocate_buffers ();
- _RETHROW;
- }
- }
-
-#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
-
__rb_tree (const __rb_tree&);
~__rb_tree ();
@@ -618,22 +572,12 @@
iterator insert (iterator, const value_type&, bool);
-#if !defined (_MSC_VER) || _MSC_VER >= 1300
-
template<class _Iterator>
void insert (_Iterator __first, _Iterator __last, bool __dup) {
for (; __first != __last; ++__first)
insert (*__first, __dup);
}
-
-#else // if _MSC_VER < 1300
-
- void insert (const_iterator, const_iterator, bool);
- void insert (const value_type*, const value_type*, bool);
-
-#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
-
iterator erase (iterator);
size_type erase (const key_type&);
@@ -864,27 +808,6 @@
#endif // _RWSTD_NO_OPTIMIZE_SPEED
-
-#if defined (_MSC_VER) && _MSC_VER < 1300
-
-template <class _Key, class _Val, class _KeyOf, class _Comp, class _Alloc>
-inline void __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::
-insert (const_iterator __first, const_iterator __last, bool __dup)
-{
- for (; __first != __last; ++__first)
- insert (*__first, __dup);
-}
-
-template <class _Key, class _Val, class _KeyOf, class _Comp, class _Alloc>
-inline void __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::
-insert (const _Val* __first, const _Val* __last, bool __dup)
-{
- for (; __first != __last; ++__first)
- insert (*__first, __dup);
-}
-
-#endif // defined (_MSC_VER) && _MSC_VER < 1300
-
template <class _Key, class _Val, class _KeyOf, class _Comp, class _Alloc>
inline void __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::
Modified: incubator/stdcxx/branches/4.2.x/include/set
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/set?rev=588724&r1=588723&r2=588724&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/set (original)
+++ incubator/stdcxx/branches/4.2.x/include/set Fri Oct 26 10:56:46 2007
@@ -107,7 +107,6 @@
typedef _TYPENAME __rep_type::pointer pointer;
typedef _TYPENAME __rep_type::const_pointer const_pointer;
#if !defined (_RWSTD_NO_MEMBER_TEMPLATES)
- // && (!defined (_MSC_VER) || _MSC_VER >= 1300)
typedef _TYPENAME __rep_type::const_reverse_iterator reverse_iterator;
#else
typedef _TYPENAME __rep_type::reverse_iterator reverse_iterator;
@@ -122,28 +121,12 @@
const allocator_type &__alloc = allocator_type ())
: _C_rep (__cmp, __alloc) { }
-#if !defined (_MSC_VER) || _MSC_VER >= 1300
-
template<class _InputIter>
set (_InputIter __first, _InputIter __last,
const key_compare& __cmp = key_compare (),
const allocator_type& __al = allocator_type ())
: _C_rep (__first, __last, __cmp, __al, false) { }
-#else // if _MSC_VER < 1300
-
- set (const value_type* __first, const value_type* __last,
- const key_compare &__cmp = key_compare (),
- const allocator_type& __alloc = allocator_type ())
- : _C_rep (__first, __last, __cmp, __alloc, false) { }
-
- set (const_iterator __first, const_iterator __last,
- const key_compare &__cmp = key_compare (),
- const allocator_type &__alloc = allocator_type ())
- : _C_rep (__first, __last, __cmp, __alloc, false) { }
-
-#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
-
set (const set &__x)
: _C_rep (__x._C_rep) { }
@@ -186,7 +169,7 @@
#if !defined (_MSC_VER) || _MSC_VER > 1300
iterator insert (iterator __it, const value_type& __x) {
- return _C_rep.insert (__it, __x, false);
+ return _C_rep.insert (__it, __x, false);
}
void erase (iterator __it) {
@@ -201,46 +184,30 @@
// working around MSVC bugs
iterator insert (iterator __it, const value_type& __x) {
- typedef _TYPENAME __rep_type::iterator _Iterator;
+ typedef _TYPENAME __rep_type::iterator _Iterator;
return _RWSTD_REINTERPRET_CAST (iterator&, _C_rep.insert (
- _RWSTD_REINTERPRET_CAST (_Iterator&, __it), __x, false));
+ _RWSTD_REINTERPRET_CAST (_Iterator&, __it), __x, false));
}
void erase (iterator __it) {
- typedef _TYPENAME __rep_type::iterator _Iterator;
+ typedef _TYPENAME __rep_type::iterator _Iterator;
_C_rep.erase (_RWSTD_REINTERPRET_CAST (_Iterator&, __it));
}
void erase (iterator __first, iterator __last) {
- typedef _TYPENAME __rep_type::iterator _Iterator;
+ typedef _TYPENAME __rep_type::iterator _Iterator;
_C_rep.erase (_RWSTD_REINTERPRET_CAST (_Iterator&, __first),
_RWSTD_REINTERPRET_CAST (_Iterator&, __last));
}
#endif
-#if !defined (_MSC_VER) || _MSC_VER >= 1300
-
template<class _InputIter>
void insert (_InputIter __first, _InputIter __last) {
for ( ;__first != __last; ++__first)
_C_rep.insert (*__first, false);
}
-#else // if _MSC_VER < 1300
-
- void insert (const value_type* __first, const value_type* __last) {
- for ( ;__first != __last; ++__first)
- _C_rep.insert (*__first, false);
- }
-
- void insert (const_iterator __first, const_iterator __last) {
- for ( ;__first != __last; ++__first)
- _C_rep.insert (*__first, false);
- }
-
-#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
-
size_type erase (const key_type& __x) {
return _C_rep.erase (__x);
}
@@ -356,28 +323,12 @@
const allocator_type &__alloc = allocator_type ())
: _C_rep (__cmp, __alloc) { }
-#if !defined (_MSC_VER) || _MSC_VER >= 1300
-
template<class _InputIter>
multiset (_InputIter __first, _InputIter __last,
const key_compare &__cmp = key_compare (),
const allocator_type &__alloc = allocator_type ())
: _C_rep (__first, __last, __cmp, __alloc, true) { }
-#else // _MSC_VER < 1300
-
- multiset (const value_type* __first, const value_type* __last,
- const key_compare &__cmp = key_compare (),
- const allocator_type &__alloc = allocator_type ())
- : _C_rep (__first, __last, __cmp, __alloc, true) { }
-
- multiset (const_iterator __first, const_iterator __last,
- const key_compare &__cmp = key_compare (),
- const allocator_type &__alloc = allocator_type ())
- : _C_rep (__first, __last, __cmp, __alloc, true) { }
-
-#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
-
multiset (const multiset &__x)
: _C_rep (__x._C_rep) { }
@@ -419,27 +370,11 @@
return _C_rep.insert (__it, __x, true);
}
-#if !defined (_MSC_VER) || _MSC_VER >= 1300
-
template<class _InputIter>
void insert (_InputIter __first, _InputIter __last) {
for ( ;__first != __last; ++__first)
_C_rep.insert (*__first, true);
}
-
-#else // _MSC_VER < 1300
-
- void insert (const value_type* __first, const value_type* __last) {
- for ( ;__first != __last; ++__first)
- _C_rep.insert (*__first, true);
- }
-
- void insert (const_iterator __first, const_iterator __last) {
- for ( ;__first != __last; ++__first)
- _C_rep.insert (*__first, true);
- }
-
-#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
void erase (iterator __it) {
_C_rep.erase (__it);
Modified: incubator/stdcxx/branches/4.2.x/include/string
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/string?rev=588724&r1=588723&r2=588724&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/string (original)
+++ incubator/stdcxx/branches/4.2.x/include/string Fri Oct 26 10:56:46 2007
@@ -48,8 +48,7 @@
#if ( defined (_RWSTD_NO_MEMBER_TEMPLATES) \
- || defined (_RWSTD_NO_EXTERN_MEMBER_TEMPLATE)) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+ || defined (_RWSTD_NO_EXTERN_MEMBER_TEMPLATE))
# define _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
#endif // _RWSTD_NO_STRING_MEMBER_TEMPLATES
Modified: incubator/stdcxx/branches/4.2.x/include/vector
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/vector?rev=588724&r1=588723&r2=588724&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/vector (original)
+++ incubator/stdcxx/branches/4.2.x/include/vector Fri Oct 26 10:56:46 2007
@@ -166,8 +166,6 @@
assign (__n, __x);
}
-#if !defined (_MSC_VER) || _MSC_VER >= 1300
-
template <class _InputIter>
vector (_InputIter __first, _InputIter __last,
const allocator_type &__alloc = allocator_type ())
@@ -175,24 +173,6 @@
assign (__first, __last);
}
-#else // if !MSVC || MSVC <= 6.0
-
- // working around an MSVC 6.0 ICE (bug #554)
- template <class _InputIter>
- vector (_InputIter __first, _InputIter __last)
- : allocator_type (), _C_begin (), _C_end (), _C_bufend () {
- assign (__first, __last);
- }
-
- template <class _InputIter>
- vector (_InputIter __first, _InputIter __last,
- const allocator_type &__alloc)
- : allocator_type (__alloc), _C_begin (), _C_end (), _C_bufend () {
- assign (__first, __last);
- }
-
-#endif // MSVC <= 6.0
-
vector (const vector &__rhs)
: allocator_type (__rhs.get_allocator ()),
_C_begin (), _C_end (), _C_bufend () {
Modified: incubator/stdcxx/branches/4.2.x/src/exception.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/src/exception.cpp?rev=588724&r1=588723&r2=588724&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/src/exception.cpp (original)
+++ incubator/stdcxx/branches/4.2.x/src/exception.cpp Fri Oct 26 10:56:46 2007
@@ -108,14 +108,14 @@
void unexpected () _RWSTD_GNUC_ATTRIBUTE ((__noreturn__));
-#if 1300 <= _MSC_VER
+#ifdef _MSC_VER
// MSVC 7 and 8 reliably define __uncaught_exception
// uncaught_exception() only seems to be defined by some compiler
// magic that requires the compiler's native C++ Standard library
// headers
# undef _RWSTD_NO_GLOBAL_UNCAUGHT_EXCEPTION
# define UNCAUGHT_EXCEPTION __uncaught_exception
-#endif // MSVC >= 7.0
+#endif // MSVC
#ifndef UNCAUGHT_EXCEPTION
# define UNCAUGHT_EXCEPTION uncaught_exception
Modified: incubator/stdcxx/branches/4.2.x/src/ti_ios.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/src/ti_ios.cpp?rev=588724&r1=588723&r2=588724&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/src/ti_ios.cpp (original)
+++ incubator/stdcxx/branches/4.2.x/src/ti_ios.cpp Fri Oct 26 10:56:46 2007
@@ -36,11 +36,4 @@
#undef _RWSTD_NO_TEMPLATE_DEFINITIONS
-#if defined (_MSC_VER) && _MSC_VER < 1300
- // shut up bogus warning C4661: 'std::ios::ios(const std::ios&)':
- // no suitable definition provided for explicit template instantiation
- // request
-# pragma warning (disable: 4661)
-#endif // MSVC < 7.0
-
#include <rw/_basic_ios.h>
Modified: incubator/stdcxx/branches/4.2.x/src/ti_wios.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/src/ti_wios.cpp?rev=588724&r1=588723&r2=588724&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/src/ti_wios.cpp (original)
+++ incubator/stdcxx/branches/4.2.x/src/ti_wios.cpp Fri Oct 26 10:56:46 2007
@@ -36,11 +36,4 @@
#undef _RWSTD_NO_TEMPLATE_DEFINITIONS
-#if defined (_MSC_VER) && _MSC_VER < 1300
- // shut up bogus warning C4661: 'std::wios::wios(const std::wios&)':
- // no suitable definition provided for explicit template instantiation
- // request
-# pragma warning (disable: 4661)
-#endif // MSVC < 7.0
-
#include <rw/_basic_ios.h>