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 )
             "        {\n"
             "        }\n"
             "    \n"
-            "        using MyType::iterator;\n"
-            "        using MyType::const_iterator;\n"
+            "        using typename Bu::List<Bu::Signal${i}<${templCallParams}> >::iterator;\n"
+            "        using typename Bu::List<Bu::Signal${i}<${templCallParams}> >::const_iterator;\n"
             "    \n"
             "        ret operator()( ${funcParams} )\n"
             "        {\n"
@@ -224,8 +224,8 @@ function genSigs( outName )
             "        {\n"
             "        }\n"
             "   \n"
-            "        using MyType::iterator;\n"
-            "        using MyType::const_iterator;\n"
+            "        using typename Bu::List<Bu::Signal${i}<void${templSpecCallParams}> >::iterator;\n"
+            "        using typename Bu::List<Bu::Signal${i}<void${templSpecCallParams}> >::const_iterator;\n"
             "   \n"
             "        void operator()( ${funcParams} )\n"
             "        {\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
     class Atom
     {
     private:
-        typedef struct Atom<t, talloc> MyType;
+        typedef class Atom<t, talloc> 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<MyType, Core>::_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<value, valuealloc, linkalloc>;
         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<value, valuealloc, linkalloc>;
         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<const _SharedType &>(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 ),
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
         uint32_t getFill() const
         {
             ReadWriteMutex::ReadLocker rl( mCore );
-            return; hCore.getFill();
+            return hCore.getFill();
         }
 
         /**