[MERGE]

src/core/common/test/WBoundingBox_test.h

@@ -28,7 +28,7 @@
 #include <cxxtest/TestSuite.h>
 
 #include <osg/Vec3d>
-#include "../math/linearAlgebra/WVectorFixed.h"
+#include "../math/linearAlgebra/WPosition.h"
 
 #include "../WBoundingBox.h"
 #include "../WLimits.h"

src/core/kernel/WModuleOutputForwardData.h

@@ -103,7 +103,7 @@ protected:
     virtual void inputNotifyDataChange( boost::shared_ptr<WModuleConnector> /*input*/, boost::shared_ptr<WModuleConnector> /*output*/ )
     {
         // if the input changes its data-> forward the change to this output instance
-        updateData( m_in->getData() );
+        WModuleOutputData< T >::updateData( m_in->getData() );
     }
 
 private: