blob: 958e09c3dce77d8971b4927c55de1b5a08a6ac02 [file] [log] [blame]
Andrew Geisslerd688a012020-09-18 13:36:00 -05001From 4e7f15346682482bc2071c7209dec97507d3bc4c Mon Sep 17 00:00:00 2001
Brad Bishop316dfdd2018-06-25 12:45:53 -04002From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 2 Sep 2017 10:03:37 -0700
Brad Bishop0a921262019-09-24 07:40:45 -04004Subject: [PATCH 02/10] Use long long instead of int64_t
Brad Bishop316dfdd2018-06-25 12:45:53 -04005
6Fixes
7error: call to member function 'appendNumber' is ambiguous
8since this function expects long long as parameter and not int64_t
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
Andrew Geisslerd688a012020-09-18 13:36:00 -050011Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
Brad Bishop316dfdd2018-06-25 12:45:53 -040012---
Brad Bishop316dfdd2018-06-25 12:45:53 -040013 src/mongo/util/procparser.cpp | 10 +++++-----
14 1 file changed, 5 insertions(+), 5 deletions(-)
15
Brad Bishop0a921262019-09-24 07:40:45 -040016diff --git a/src/mongo/util/procparser.cpp b/src/mongo/util/procparser.cpp
Andrew Geisslerd688a012020-09-18 13:36:00 -050017index 24b9d1e2c9..0f274cfff6 100644
Brad Bishop0a921262019-09-24 07:40:45 -040018--- a/src/mongo/util/procparser.cpp
19+++ b/src/mongo/util/procparser.cpp
20@@ -261,7 +261,7 @@ Status parseProcStat(const std::vector<StringData>& keys,
Brad Bishop316dfdd2018-06-25 12:45:53 -040021
22 StringData stringValue((*partIt).begin(), (*partIt).end() - (*partIt).begin());
23
24- uint64_t value;
25+ long long value;
26
Andrew Geisslerd688a012020-09-18 13:36:00 -050027 if (!NumberParser{}(stringValue, &value).isOK()) {
Brad Bishop316dfdd2018-06-25 12:45:53 -040028 value = 0;
Brad Bishop0a921262019-09-24 07:40:45 -040029@@ -273,7 +273,7 @@ Status parseProcStat(const std::vector<StringData>& keys,
Brad Bishop316dfdd2018-06-25 12:45:53 -040030 } else {
31 StringData stringValue((*partIt).begin(), (*partIt).end() - (*partIt).begin());
32
33- uint64_t value;
34+ long long value;
35
Andrew Geisslerd688a012020-09-18 13:36:00 -050036 if (!NumberParser{}(stringValue, &value).isOK()) {
Brad Bishop316dfdd2018-06-25 12:45:53 -040037 value = 0;
Brad Bishop0a921262019-09-24 07:40:45 -040038@@ -366,7 +366,7 @@ Status parseProcMemInfo(const std::vector<StringData>& keys,
Brad Bishop316dfdd2018-06-25 12:45:53 -040039
40 StringData stringValue((*partIt).begin(), (*partIt).end());
41
42- uint64_t value;
43+ long long value;
44
Andrew Geisslerd688a012020-09-18 13:36:00 -050045 if (!NumberParser{}(stringValue, &value).isOK()) {
Brad Bishop316dfdd2018-06-25 12:45:53 -040046 value = 0;
Brad Bishop0a921262019-09-24 07:40:45 -040047@@ -522,7 +522,7 @@ Status parseProcDiskStats(const std::vector<StringData>& disks,
Brad Bishop316dfdd2018-06-25 12:45:53 -040048 StringData data,
49 BSONObjBuilder* builder) {
50 bool foundKeys = false;
51- std::vector<uint64_t> stats;
52+ std::vector<long long> stats;
53 stats.reserve(kDiskFieldCount);
54
55 using string_split_iterator = boost::split_iterator<StringData::const_iterator>;
Brad Bishop0a921262019-09-24 07:40:45 -040056@@ -597,7 +597,7 @@ Status parseProcDiskStats(const std::vector<StringData>& disks,
Brad Bishop316dfdd2018-06-25 12:45:53 -040057
58 StringData stringValue((*partIt).begin(), (*partIt).end());
59
60- uint64_t value;
61+ long long value;
62
Andrew Geisslerd688a012020-09-18 13:36:00 -050063 if (!NumberParser{}(stringValue, &value).isOK()) {
Brad Bishop316dfdd2018-06-25 12:45:53 -040064 value = 0;
Brad Bishop0a921262019-09-24 07:40:45 -040065--
Andrew Geisslerd688a012020-09-18 13:36:00 -0500662.24.0
Brad Bishop0a921262019-09-24 07:40:45 -040067