Merge branch 'main' into write-data-page-v2

r-lib · Aug 9, 2024 · 21f0589 · 21f0589
2 parents f69ca15 + b1a9e68
commit 21f0589
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/write.cpp b/src/write.cpp
@@ -1144,11 +1144,11 @@ static bool parse_uuid(const char *c, char *u, char *t) {
   uint16_t *p4 = (uint16_t*) (t + 8);
   uint64_t *p5 = (uint64_t*) (t + 10);
 
-  *p1 = strtoul(c, NULL, 16);
-  *p2 = strtoul(c + 9, NULL, 16);
-  *p3 = strtoul(c + 14, NULL, 16);
-  *p4 = strtoul(c + 19, NULL, 16);
-  *p5 = strtoul(c + 24, NULL, 16);
+  *p1 = std::strtoul(c, NULL, 16);
+  *p2 = std::strtoul(c + 9, NULL, 16);
+  *p3 = std::strtoul(c + 14, NULL, 16);
+  *p4 = std::strtoul(c + 19, NULL, 16);
+  *p5 = std::strtoull(c + 24, NULL, 16);
 
   // TODO: fix for big endian, this is little endian swap
   u[0] = t[3]; u[1] = t[2]; u[2] = t[1]; u[3] = t[0];