diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-12-20 07:58:09 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-12-20 07:58:09 +0000 |
| commit | 09f2a07e67b4b239f47e3c1e343df67080643316 (patch) | |
| tree | fdd2515f719f85f556d6535089e2742c3c46bb1d /ACE/ace/checked_iterator.h | |
| parent | dfb090b21480c638e484eeab7ea406832902619d (diff) | |
| download | ATCD-09f2a07e67b4b239f47e3c1e343df67080643316.tar.gz | |
Sun Dec 20 07:58:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/checked_iterator.h:
stl port doesn't have a checked iterator. This fixes bugzilla
3799 and 3420. Thanks to <sailzeng at tencent dot com> and
Mark Hebbel <Mark dot Hebbel at baslerweb dot com> for
reporting this
Diffstat (limited to 'ACE/ace/checked_iterator.h')
| -rw-r--r-- | ACE/ace/checked_iterator.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ACE/ace/checked_iterator.h b/ACE/ace/checked_iterator.h index ac5e44f6dfc..98df3d757b0 100644 --- a/ACE/ace/checked_iterator.h +++ b/ACE/ace/checked_iterator.h @@ -32,12 +32,12 @@ * @author Ossama Othman */ -# if defined (_MSC_VER) && (_MSC_FULL_VER >= 140050000) +# if defined (_MSC_VER) && (_MSC_FULL_VER >= 140050000) && (!defined (_STLPORT_VERSION)) // Checked iterators are currently only supported in MSVC++ 8 or better. # include <iterator> -# endif /* _MSC_VER >= 1400 */ +# endif /* _MSC_VER >= 1400 && !_STLPORT_VERSION */ -# if defined (_MSC_VER) && (_MSC_FULL_VER >= 140050000) +# if defined (_MSC_VER) && (_MSC_FULL_VER >= 140050000) && (!defined (_STLPORT_VERSION)) template <typename PTR> stdext::checked_array_iterator<PTR> ACE_make_checked_array_iterator (PTR buf, size_t len) @@ -53,6 +53,6 @@ ACE_make_checked_array_iterator (PTR buf, size_t /* len */) // the buffer itself. return buf; } -# endif /* _MSC_VER >= 1400 */ +# endif /* _MSC_VER >= 1400 && !_STLPORT_VERSION */ #endif /* ACE_CHECKED_ITERATOR_H */ |