1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
From a4951489d649c2b609cbb80f6cfb49fdcad8bd43 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 2 Sep 2017 10:03:37 -0700
Subject: [PATCH] Use long long instead of int64_t
Fixes
error: call to member function 'appendNumber' is ambiguous
since this function expects long long as parameter and not int64_t
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
src/mongo/util/procparser.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
Index: git/src/mongo/util/procparser.cpp
===================================================================
--- git.orig/src/mongo/util/procparser.cpp
+++ git/src/mongo/util/procparser.cpp
@@ -260,7 +260,7 @@ Status parseProcStat(const std::vector<S
StringData stringValue((*partIt).begin(), (*partIt).end() - (*partIt).begin());
- uint64_t value;
+ long long value;
if (!parseNumberFromString(stringValue, &value).isOK()) {
value = 0;
@@ -272,7 +272,7 @@ Status parseProcStat(const std::vector<S
} else {
StringData stringValue((*partIt).begin(), (*partIt).end() - (*partIt).begin());
- uint64_t value;
+ long long value;
if (!parseNumberFromString(stringValue, &value).isOK()) {
value = 0;
@@ -365,7 +365,7 @@ Status parseProcMemInfo(const std::vecto
StringData stringValue((*partIt).begin(), (*partIt).end());
- uint64_t value;
+ long long value;
if (!parseNumberFromString(stringValue, &value).isOK()) {
value = 0;
@@ -522,7 +522,7 @@ Status parseProcDiskStats(const std::vec
StringData data,
BSONObjBuilder* builder) {
bool foundKeys = false;
- std::vector<uint64_t> stats;
+ std::vector<long long> stats;
stats.reserve(kDiskFieldCount);
using string_split_iterator = boost::split_iterator<StringData::const_iterator>;
@@ -597,7 +597,7 @@ Status parseProcDiskStats(const std::vec
StringData stringValue((*partIt).begin(), (*partIt).end());
- uint64_t value;
+ long long value;
if (!parseNumberFromString(stringValue, &value).isOK()) {
value = 0;
|
