From 0520eadabd18a1e21929002a66885f91856f8a02 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Mon, 3 Feb 2014 07:02:42 +0000 Subject: Compiles with LLVM 3.4 as well now. --- src/stable/atom.h | 2 +- src/stable/list.h | 14 +++++++------- src/stable/sharedcore.h | 2 +- src/stable/string.h | 6 ------ 4 files changed, 9 insertions(+), 15 deletions(-) (limited to 'src/stable') diff --git a/src/stable/atom.h b/src/stable/atom.h index 7cef92a..88d0419 100644 --- a/src/stable/atom.h +++ b/src/stable/atom.h @@ -23,7 +23,7 @@ namespace Bu class Atom { private: - typedef struct Atom MyType; + typedef class Atom MyType; public: Atom() : diff --git a/src/stable/list.h b/src/stable/list.h index 5ab7117..582e0e4 100644 --- a/src/stable/list.h +++ b/src/stable/list.h @@ -222,8 +222,8 @@ namespace Bu using SharedCore::_allocateCore; public: - struct const_iterator; - struct iterator; + class const_iterator; + class iterator; List() { @@ -489,9 +489,9 @@ namespace Bu /** * An iterator to iterate through your list. */ - typedef struct iterator + class iterator { - friend struct const_iterator; + friend class const_iterator; friend class List; private: Link *pLink; @@ -652,12 +652,12 @@ namespace Bu pLink = oth.pLink; return *this; } - } iterator; + }; /** *@see iterator */ - typedef struct const_iterator + class const_iterator { friend class List; private: @@ -792,7 +792,7 @@ namespace Bu { return pLink != NULL; } - } const_iterator; + }; /** * Get an iterator pointing to the first item in the list. diff --git a/src/stable/sharedcore.h b/src/stable/sharedcore.h index e79c3d6..84bfdcf 100644 --- a/src/stable/sharedcore.h +++ b/src/stable/sharedcore.h @@ -110,7 +110,7 @@ namespace Bu bool isCoreShared( const Shell &rOther ) const { - return rOther.core == core; + return dynamic_cast(rOther).core == core; } protected: diff --git a/src/stable/string.h b/src/stable/string.h index 420f40c..b4252c6 100644 --- a/src/stable/string.h +++ b/src/stable/string.h @@ -88,12 +88,6 @@ namespace Bu iPos( i.iPos ) { } - - const_iterator( const struct iterator &i ) : - pChunk( i.pChunk ), - iPos( i.iPos ) - { - } const_iterator() : pChunk( NULL ), -- cgit v1.2.3