From 9574e94b3d5d7dc36e0c99aa45fadf3ec8024131 Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Thu, 5 Feb 2015 09:13:13 -0800 Subject: [PATCH] win: minidump_writeable_test_util from constexpr to enum No constexpr on VS2013. :( R=mark@chromium.org BUG=crashpad:1 Review URL: https://codereview.chromium.org/897173005 --- minidump/test/minidump_writable_test_util.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/minidump/test/minidump_writable_test_util.cc b/minidump/test/minidump_writable_test_util.cc index b2ea242a..37b2f048 100644 --- a/minidump/test/minidump_writable_test_util.cc +++ b/minidump/test/minidump_writable_test_util.cc @@ -159,7 +159,7 @@ namespace { struct MinidumpMemoryListTraits { using ListType = MINIDUMP_MEMORY_LIST; - static constexpr size_t kElementSize = sizeof(MINIDUMP_MEMORY_DESCRIPTOR); + enum : size_t { kElementSize = sizeof(MINIDUMP_MEMORY_DESCRIPTOR) }; static size_t ElementCount(const ListType* list) { return list->NumberOfMemoryRanges; } @@ -167,7 +167,7 @@ struct MinidumpMemoryListTraits { struct MinidumpModuleListTraits { using ListType = MINIDUMP_MODULE_LIST; - static constexpr size_t kElementSize = sizeof(MINIDUMP_MODULE); + enum : size_t { kElementSize = sizeof(MINIDUMP_MODULE) }; static size_t ElementCount(const ListType* list) { return list->NumberOfModules; } @@ -175,7 +175,7 @@ struct MinidumpModuleListTraits { struct MinidumpThreadListTraits { using ListType = MINIDUMP_THREAD_LIST; - static constexpr size_t kElementSize = sizeof(MINIDUMP_THREAD); + enum : size_t { kElementSize = sizeof(MINIDUMP_THREAD) }; static size_t ElementCount(const ListType* list) { return list->NumberOfThreads; } @@ -183,7 +183,7 @@ struct MinidumpThreadListTraits { struct MinidumpLocationDescriptorListTraits { using ListType = MinidumpLocationDescriptorList; - static constexpr size_t kElementSize = sizeof(MINIDUMP_LOCATION_DESCRIPTOR); + enum : size_t { kElementSize = sizeof(MINIDUMP_LOCATION_DESCRIPTOR) }; static size_t ElementCount(const ListType* list) { return list->count; } @@ -191,8 +191,7 @@ struct MinidumpLocationDescriptorListTraits { struct MinidumpSimpleStringDictionaryListTraits { using ListType = MinidumpSimpleStringDictionary; - static constexpr size_t kElementSize = - sizeof(MinidumpSimpleStringDictionaryEntry); + enum : size_t { kElementSize = sizeof(MinidumpSimpleStringDictionaryEntry) }; static size_t ElementCount(const ListType* list) { return list->count; }