diff options
| author | Mark Mentovai <mark@chromium.org> | 2016-07-20 10:08:14 -0400 |
|---|---|---|
| committer | Mark Mentovai <mark@chromium.org> | 2016-07-20 10:08:14 -0400 |
| commit | 5f638d532312685548d5033618c8a36f73302d0a (patch) | |
| tree | 34d1a6c0bf740d1f7fb18e6c215188f2e2ab4b39 /src/google_breakpad | |
| parent | Revert "Don't define |r_debug| and |link_map| on Android releases 21 and later" (diff) | |
| download | breakpad-5f638d532312685548d5033618c8a36f73302d0a.tar.xz | |
Remove DISALLOW_COPY_AND_ASSIGN from MinidumpStreamInfo
DISALLOW_COPY_AND_ASSIGN was inadvertently added to
Minidump::MinidumpStreamInfo in f04a010f71f6, but this class is used as
the value side of the Minidump::stream_map_ map and must be copyable
(with an old enough C++ library).
This broke:
https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_rel_ng/builds/247141/steps/compile%20%28with%20patch%29/logs/stdio
TBR=ivanpe@chromium.org
Review URL: https://codereview.chromium.org/2158423003 .
Diffstat (limited to 'src/google_breakpad')
| -rw-r--r-- | src/google_breakpad/processor/minidump.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/google_breakpad/processor/minidump.h b/src/google_breakpad/processor/minidump.h index 88a3926a..c8c3cd48 100644 --- a/src/google_breakpad/processor/minidump.h +++ b/src/google_breakpad/processor/minidump.h @@ -1113,9 +1113,6 @@ class Minidump { // Pointer to the stream if cached, or NULL if not yet populated MinidumpStream* stream; - - private: - DISALLOW_COPY_AND_ASSIGN(MinidumpStreamInfo); }; typedef vector<MDRawDirectory> MinidumpDirectoryEntries; |