Index: include/cssysdef.h
===================================================================
--- include/cssysdef.h	(revision 25334)
+++ include/cssysdef.h	(working copy)
@@ -75,6 +75,8 @@
 #  if (__GNUC__ == 3) && (__GNUC_MINOR__ == 4)
     // Work around a gcc 3.4 issue where forcing inline doesn't always work
 #   define CS_FORCEINLINE_TEMPLATEMETHOD inline
+#   undef CS_FORCEINLINE
+#   define CS_FORCEINLINE inline
 #  endif
 # else
 #  define CS_FORCEINLINE inline
Index: libs/csutil/t/blockallocator.t
===================================================================
--- libs/csutil/t/blockallocator.t	(revision 25334)
+++ libs/csutil/t/blockallocator.t	(working copy)
@@ -46,7 +46,7 @@
     size_t get_granularity() const { return S::size; }
     size_t get_element_size() const { return S::elsize; }
     size_t get_block_size() const { return S::blocksize; }
-    size_t get_block_count() const { return S::blocks.GetSize(); }
+    size_t get_block_count() const { return S::blocks.b.GetSize(); }
     csBitArray get_allocation_map() const { return S::GetAllocationMap(); }
   };
 
Index: libs/csutil/t/eventqueue.t
===================================================================
--- libs/csutil/t/eventqueue.t	(revision 25334)
+++ libs/csutil/t/eventqueue.t	(working copy)
@@ -181,7 +181,7 @@
 
   csEventTree *frameEvent = queue->EventTree->FindNode(csevFrame (objreg), queue);
 
-  frameEvent->fatRecord->SubscriberGraph->Dump (objreg);
+  //frameEvent->fatRecord->SubscriberGraph->Dump (objreg);
 
   CPPUNIT_ASSERT_MESSAGE ("List is empty", !handlers->IsEmpty());
 
Index: libs/csutil/t/objreg.t
===================================================================
--- libs/csutil/t/objreg.t	(revision 25334)
+++ libs/csutil/t/objreg.t	(working copy)
@@ -178,11 +178,11 @@
   CPPUNIT_ASSERT(if2.IsValid());
 
   csRef<iString> cmp1, cmp2;
-  cmp1.AttachNew(static_cast<iString*> (objreg->Get(
+  cmp1.AttachNew(dynamic_cast<iString*> (objreg->Get(
     "Test Object Registry one",
     scfInterfaceTraits<iString>::GetID(),
     scfInterfaceTraits<iString>::GetVersion())));
-  cmp2.AttachNew(static_cast<iString*> (objreg->Get(
+  cmp2.AttachNew(dynamic_cast<iString*> (objreg->Get(
     "Test Object Registry two",
     scfInterfaceTraits<iString>::GetID(),
     scfInterfaceTraits<iString>::GetVersion())));