diff --git a/src/libraries/turtle/boost_test_error.hpp b/src/libraries/turtle/boost_test_error.hpp
index b878110..51809fc 100644
--- a/src/libraries/turtle/boost_test_error.hpp
+++ b/src/libraries/turtle/boost_test_error.hpp
@@ -33,7 +33,7 @@ namespace mock
         static void checkpoint( const char* file, int line )
         {
             boost::unit_test::unit_test_log.set_checkpoint( file,
-                (std::size_t)line );
+                static_cast< std::size_t >( line ) );
         }
 
         template< typename Context >
@@ -43,7 +43,8 @@ namespace mock
         {
             boost::unit_test::framework::assertion_result( false );
             boost::unit_test::unit_test_log
-                << boost::unit_test::log::begin( file, (std::size_t)line )
+                << boost::unit_test::log::begin( file,
+                    static_cast< std::size_t >( line ) )
                 << boost::unit_test::log_all_errors
                 << message << ": " << context
                 << boost::unit_test::log::end();
@@ -55,7 +56,8 @@ namespace mock
         {
             boost::unit_test::framework::assertion_result( true );
             boost::unit_test::unit_test_log
-                << boost::unit_test::log::begin( file, (std::size_t)line )
+                << boost::unit_test::log::begin( file,
+                    static_cast< std::size_t >( line ) )
                 << boost::unit_test::log_successful_tests
                 << "mock expectation fulfilled: " << context
                 << boost::unit_test::log::end();
diff --git a/src/libraries/turtle/type_name.hpp b/src/libraries/turtle/type_name.hpp
index 56f52d7..d3c4596 100644
--- a/src/libraries/turtle/type_name.hpp
+++ b/src/libraries/turtle/type_name.hpp
@@ -59,9 +59,10 @@ namespace detail
 #endif
                 serialize( s, name );
         }
-        void serialize( std::ostream& s, boost::unit_test::const_string name ) const
+        void serialize( std::ostream& s,
+            boost::unit_test::const_string name ) const
         {
-            std::size_t p = name.rfind( "::" );
+            boost::unit_test::const_string::size_type p = name.rfind( "::" );
             if( p != boost::unit_test::const_string::npos )
             {
                 s << name.substr( p + 2 );