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