diff options
author | VemundH <vemund.handeland@kdi.kongsberg.com> | 2020-11-21 13:37:18 +0100 |
---|---|---|
committer | VemundH <vemund.handeland@kdi.kongsberg.com> | 2020-11-21 13:37:18 +0100 |
commit | 6c973f1356c5c99de559c20bb89c5d7cbd4a006a (patch) | |
tree | 839bd4d6a1a6e5144ff29492998ee0d7413a7ed0 /ACE/ace/CDR_Base.h | |
parent | a853ed1e57ca2d89c7f99cef27fa84804c621bd3 (diff) | |
download | ATCD-6c973f1356c5c99de559c20bb89c5d7cbd4a006a.tar.gz |
remove std::iterator
Diffstat (limited to 'ACE/ace/CDR_Base.h')
-rw-r--r-- | ACE/ace/CDR_Base.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h index a8b49e5a0a1..815f0e009ee 100644 --- a/ACE/ace/CDR_Base.h +++ b/ACE/ace/CDR_Base.h @@ -397,10 +397,15 @@ public: }; class Iterator - : public std::iterator<std::bidirectional_iterator_tag, Proxy> - , private IteratorBase + : private IteratorBase { public: + typedef std::bidirectional_iterator_tag iterator_category; + typedef Proxy value_type; + typedef std::ptrdiff_t difference_type; + typedef Proxy* pointer; + typedef Proxy& reference; + explicit Iterator (Fixed *outer, int digit = 0); Proxy operator* (); Iterator &operator+= (std::ptrdiff_t n); @@ -415,10 +420,15 @@ public: }; class ConstIterator - : public std::iterator<std::bidirectional_iterator_tag, Octet> - , private IteratorBase + : public IteratorBase { public: + typedef std::bidirectional_iterator_tag iterator_category; + typedef Octet value_type; + typedef std::ptrdiff_t difference_type; + typedef Octet* pointer; + typedef Octet& reference; + explicit ConstIterator (const Fixed *outer, int digit = 0); Octet operator* (); ConstIterator &operator+= (std::ptrdiff_t n); |