diff --git a/include/rapidjson/internal/strfunc.h b/include/rapidjson/internal/strfunc.h
index 47b8ac0..0a20c56 100644
--- a/include/rapidjson/internal/strfunc.h
+++ b/include/rapidjson/internal/strfunc.h
@@ -13,8 +13,7 @@ namespace internal {
 template <typename Ch>
 inline SizeType StrLen(const Ch* s) {
 	const Ch* p = s;
-	while (*p != '\0')
-		++p;
+	while (*p) ++p;
 	return SizeType(p - s);
 }
 
diff --git a/test/unittest/unittest.h b/test/unittest/unittest.h
index 75d2bc4..0234319 100644
--- a/test/unittest/unittest.h
+++ b/test/unittest/unittest.h
@@ -27,10 +27,10 @@
 #endif
 
 template <typename Ch>
-inline size_t StrLen(const Ch* s) {
+inline unsigned StrLen(const Ch* s) {
 	const Ch* p = s;
 	while (*p) p++;
-	return p - s;
+	return unsigned(p - s);
 }
 
 template<typename Ch>