Fix clang warnings.

jtv · Jan 28, 2019 · ac8d50e · ac8d50e
1 parent d2f0918
commit ac8d50e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/sql_cursor.cxx b/src/sql_cursor.cxx
@@ -77,7 +77,7 @@ std::string::size_type find_query_end(
         [text, &end](const char *gbegin, const char *gend)
         {
           if (gend - gbegin > 1 or not useless_trail(*gbegin))
-            end = gend - text;
+            end = std::string::size_type(gend - text);
         },
         text, size);
   }
@@ -124,7 +124,7 @@ pqxx::internal::sql_cursor::sql_cursor(
   if (hold) cq << "WITH HOLD ";
 
   cq << "FOR ";
-  cq.write(query.c_str(), qend);
+  cq.write(query.c_str(), std::streamsize(qend));
   cq << ' ';
 
   if (up != cursor_base::update) cq << "FOR READ ONLY ";

diff --git a/test/unit/test_encodings.cxx b/test/unit/test_encodings.cxx
@@ -56,7 +56,7 @@ void test_for_glyphs_empty()
 void test_for_glyphs_ascii()
 {
   const std::string text{"hi"};
-  std::vector<std::size_t> points;
+  std::vector<std::ptrdiff_t> points;
 
   pqxx::internal::for_glyphs(
 	pqxx::internal::encoding_group::UTF8,
@@ -66,7 +66,7 @@ void test_for_glyphs_ascii()
 	text.c_str(),
 	text.size());
 
-  PQXX_CHECK_EQUAL(points.size(), 2ul, "Wrong number of ASCII iterations.");
+  PQXX_CHECK_EQUAL(points.size(), 2u, "Wrong number of ASCII iterations.");
   PQXX_CHECK_EQUAL(points[0], 1u, "ASCII iteration started off wrong.");
   PQXX_CHECK_EQUAL(points[1], 1u, "ASCII iteration was inconsistent.");
 }
@@ -76,7 +76,7 @@ void test_for_glyphs_utf8()
 {
   // Greek: alpha omega.
   const std::string text{"\xce\x91\xce\xa9"};
-  std::vector<std::size_t> points;
+  std::vector<std::ptrdiff_t> points;
 
   pqxx::internal::for_glyphs(
 	pqxx::internal::encoding_group::UTF8,