| Index: src/client/linux/handler/microdump_extra_info.h
|
| diff --git a/src/common/simple_string_dictionary.cc b/src/client/linux/handler/microdump_extra_info.h
|
| similarity index 74%
|
| copy from src/common/simple_string_dictionary.cc
|
| copy to src/client/linux/handler/microdump_extra_info.h
|
| index e0a74ceeb4ba0ac05e12c78583508a30ca40d50a..b9c3d30dc06ef46972362b95eedff6f6a513ac98 100644
|
| --- a/src/common/simple_string_dictionary.cc
|
| +++ b/src/client/linux/handler/microdump_extra_info.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2007, Google Inc.
|
| +// Copyright 2015 Google Inc.
|
| // All rights reserved.
|
| //
|
| // Redistribution and use in source and binary forms, with or without
|
| @@ -27,19 +27,22 @@
|
| // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| -#include "common/simple_string_dictionary.h"
|
| +#ifndef CLIENT_LINUX_HANDLER_MICRODUMP_EXTRA_INFO_H_
|
| +#define CLIENT_LINUX_HANDLER_MICRODUMP_EXTRA_INFO_H_
|
|
|
| namespace google_breakpad {
|
|
|
| -namespace {
|
| +struct MicrodumpExtraInfo {
|
| + // Strings pointed to by this struct are not copied, and are
|
| + // expected to remain valid for the lifetime of the process.
|
| + const char* build_fingerprint;
|
| + const char* product_info;
|
| + const char* gpu_fingerprint;
|
|
|
| -// In C++98 (ISO 14882), section 9.5.1 says that a union cannot have a member
|
| -// with a non-trivial ctor, copy ctor, dtor, or assignment operator. Use this
|
| -// property to ensure that Entry remains POD.
|
| -union Compile_Assert {
|
| - NonAllocatingMap<1, 1, 1>::Entry Compile_Assert__entry_must_be_pod;
|
| + MicrodumpExtraInfo()
|
| + : build_fingerprint(NULL), product_info(NULL), gpu_fingerprint(NULL) {}
|
| };
|
|
|
| }
|
|
|
| -} // namespace google_breakpad
|
| +#endif // CLIENT_LINUX_HANDLER_MICRODUMP_EXTRA_INFO_H_
|
|
|