aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2014-02-03 07:02:42 +0000
committerMike Buland <eichlan@xagasoft.com>2014-02-03 07:02:42 +0000
commit0520eadabd18a1e21929002a66885f91856f8a02 (patch)
tree27230839fe02b20f89c43edeeed6b57d48dfc8f0
parent3769f85c80ffeb403c5310aa4a1e1914f90219a3 (diff)
downloadlibbu++-0520eadabd18a1e21929002a66885f91856f8a02.tar.gz
libbu++-0520eadabd18a1e21929002a66885f91856f8a02.tar.bz2
libbu++-0520eadabd18a1e21929002a66885f91856f8a02.tar.xz
libbu++-0520eadabd18a1e21929002a66885f91856f8a02.zip
Compiles with LLVM 3.4 as well now.
-rw-r--r--gensigs.bld8
-rw-r--r--src/stable/atom.h2
-rw-r--r--src/stable/list.h14
-rw-r--r--src/stable/sharedcore.h2
-rw-r--r--src/stable/string.h6
-rw-r--r--src/unstable/synchrohash.h2
6 files changed, 14 insertions, 20 deletions
diff --git a/gensigs.bld b/gensigs.bld
index ed36f61..63b381d 100644
--- a/gensigs.bld
+++ b/gensigs.bld
@@ -196,8 +196,8 @@ function genSigs( outName )
196 " {\n" 196 " {\n"
197 " }\n" 197 " }\n"
198 " \n" 198 " \n"
199 " using MyType::iterator;\n" 199 " using typename Bu::List<Bu::Signal${i}<${templCallParams}> >::iterator;\n"
200 " using MyType::const_iterator;\n" 200 " using typename Bu::List<Bu::Signal${i}<${templCallParams}> >::const_iterator;\n"
201 " \n" 201 " \n"
202 " ret operator()( ${funcParams} )\n" 202 " ret operator()( ${funcParams} )\n"
203 " {\n" 203 " {\n"
@@ -224,8 +224,8 @@ function genSigs( outName )
224 " {\n" 224 " {\n"
225 " }\n" 225 " }\n"
226 " \n" 226 " \n"
227 " using MyType::iterator;\n" 227 " using typename Bu::List<Bu::Signal${i}<void${templSpecCallParams}> >::iterator;\n"
228 " using MyType::const_iterator;\n" 228 " using typename Bu::List<Bu::Signal${i}<void${templSpecCallParams}> >::const_iterator;\n"
229 " \n" 229 " \n"
230 " void operator()( ${funcParams} )\n" 230 " void operator()( ${funcParams} )\n"
231 " {\n" 231 " {\n"
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
23 class Atom 23 class Atom
24 { 24 {
25 private: 25 private:
26 typedef struct Atom<t, talloc> MyType; 26 typedef class Atom<t, talloc> MyType;
27 27
28 public: 28 public:
29 Atom() : 29 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
222 using SharedCore<MyType, Core>::_allocateCore; 222 using SharedCore<MyType, Core>::_allocateCore;
223 223
224 public: 224 public:
225 struct const_iterator; 225 class const_iterator;
226 struct iterator; 226 class iterator;
227 227
228 List() 228 List()
229 { 229 {
@@ -489,9 +489,9 @@ namespace Bu
489 /** 489 /**
490 * An iterator to iterate through your list. 490 * An iterator to iterate through your list.
491 */ 491 */
492 typedef struct iterator 492 class iterator
493 { 493 {
494 friend struct const_iterator; 494 friend class const_iterator;
495 friend class List<value, valuealloc, linkalloc>; 495 friend class List<value, valuealloc, linkalloc>;
496 private: 496 private:
497 Link *pLink; 497 Link *pLink;
@@ -652,12 +652,12 @@ namespace Bu
652 pLink = oth.pLink; 652 pLink = oth.pLink;
653 return *this; 653 return *this;
654 } 654 }
655 } iterator; 655 };
656 656
657 /** 657 /**
658 *@see iterator 658 *@see iterator
659 */ 659 */
660 typedef struct const_iterator 660 class const_iterator
661 { 661 {
662 friend class List<value, valuealloc, linkalloc>; 662 friend class List<value, valuealloc, linkalloc>;
663 private: 663 private:
@@ -792,7 +792,7 @@ namespace Bu
792 { 792 {
793 return pLink != NULL; 793 return pLink != NULL;
794 } 794 }
795 } const_iterator; 795 };
796 796
797 /** 797 /**
798 * Get an iterator pointing to the first item in the list. 798 * 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
110 110
111 bool isCoreShared( const Shell &rOther ) const 111 bool isCoreShared( const Shell &rOther ) const
112 { 112 {
113 return rOther.core == core; 113 return dynamic_cast<const _SharedType &>(rOther).core == core;
114 } 114 }
115 115
116 protected: 116 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
88 iPos( i.iPos ) 88 iPos( i.iPos )
89 { 89 {
90 } 90 }
91
92 const_iterator( const struct iterator &i ) :
93 pChunk( i.pChunk ),
94 iPos( i.iPos )
95 {
96 }
97 91
98 const_iterator() : 92 const_iterator() :
99 pChunk( NULL ), 93 pChunk( NULL ),
diff --git a/src/unstable/synchrohash.h b/src/unstable/synchrohash.h
index 19433e7..2ca28d3 100644
--- a/src/unstable/synchrohash.h
+++ b/src/unstable/synchrohash.h
@@ -96,7 +96,7 @@ namespace Bu
96 uint32_t getFill() const 96 uint32_t getFill() const
97 { 97 {
98 ReadWriteMutex::ReadLocker rl( mCore ); 98 ReadWriteMutex::ReadLocker rl( mCore );
99 return; hCore.getFill(); 99 return hCore.getFill();
100 } 100 }
101 101
102 /** 102 /**