aboutsummaryrefslogtreecommitdiff
path: root/src/processor/proc_maps_linux.cc
diff options
context:
space:
mode:
authorTed Mielczarek <ted@mielczarek.org>2015-10-06 08:03:57 -0400
committerTed Mielczarek <ted@mielczarek.org>2015-10-06 08:03:57 -0400
commitdbf56c53a039cb91b6f2a7e00b3ac833509f5b92 (patch)
tree13714d24cb9e5635a88d4411dcb2713146de2a73 /src/processor/proc_maps_linux.cc
parentIncreasing the Breakpad stack walker max scan limit from 30 to 40. (diff)
downloadbreakpad-dbf56c53a039cb91b6f2a7e00b3ac833509f5b92.tar.xz
Fix MSVC build (including on 2015), drop some workarounds for MSVC older than 2013.
The Windows client gyp files were missing proc_maps_linux.cc for the unittest build. Adding that revealed some build errors due to it unconditionally including <inttypes.h>. Removing the workarounds in breakpad_types.h (and a few other places) made that build, which means that Visual C++ 2013 is now our minimum supported version of MSVC. Additionally I tried building with VC++ 2015 and fixed a few warnings (which were failing the build because we have /WX enabled) to ensure that that builds as well. BUG=https://code.google.com/p/google-breakpad/issues/detail?id=669 R=mark@chromium.org Review URL: https://codereview.chromium.org/1353893002 .
Diffstat (limited to 'src/processor/proc_maps_linux.cc')
-rw-r--r--src/processor/proc_maps_linux.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/processor/proc_maps_linux.cc b/src/processor/proc_maps_linux.cc
index ed185712..0cd3772e 100644
--- a/src/processor/proc_maps_linux.cc
+++ b/src/processor/proc_maps_linux.cc
@@ -34,16 +34,16 @@ bool ParseProcMaps(const std::string& input,
// Split the string by newlines.
std::vector<std::string> lines;
- std::string line = "";
+ std::string l = "";
for (size_t i = 0; i < input.size(); i++) {
if (input[i] != '\n' && input[i] != '\r') {
- line.push_back(input[i]);
- } else if (line.size() > 0) {
- lines.push_back(line);
- line.clear();
+ l.push_back(input[i]);
+ } else if (l.size() > 0) {
+ lines.push_back(l);
+ l.clear();
}
}
- if (line.size() > 0) {
+ if (l.size() > 0) {
BPLOG(ERROR) << "Input doesn't end in newline";
return false;
}