summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-09-12 11:13:40 +0100
committerCarl Hetherington <cth@carlh.net>2016-09-12 11:13:40 +0100
commit141ab2fa29b5816c1b9eef46b85e146f73178b1b (patch)
tree8a3ace899963ddd8196f475c0338cb25ea5a683f
parent571f180e4da23a79277b09bbbcbfb6b176a895df (diff)
Try to normalise use of int64/long int across raw/locale convert.
-rw-r--r--src/locale_convert.cc6
-rw-r--r--src/locale_convert.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/locale_convert.cc b/src/locale_convert.cc
index fc156244..129ee50f 100644
--- a/src/locale_convert.cc
+++ b/src/locale_convert.cc
@@ -185,11 +185,11 @@ dcp::locale_convert (string x, int, bool)
}
template<>
-int64_t
+long int
dcp::locale_convert (string x, int, bool)
{
- int64_t y = 0;
- sscanf (x.c_str(), "%" PRId64, &y);
+ long int y = 0;
+ sscanf (x.c_str(), "%ld", &y);
return y;
}
diff --git a/src/locale_convert.h b/src/locale_convert.h
index 760e1068..05728409 100644
--- a/src/locale_convert.h
+++ b/src/locale_convert.h
@@ -112,7 +112,7 @@ int
locale_convert (std::string x, int, bool);
template <>
-int64_t
+long int
locale_convert (std::string x, int, bool);
template <>