From 5dad29423e62292c6ff468cabfee4422ba55b18b Mon Sep 17 00:00:00 2001 From: Mark Mentovai Date: Thu, 2 Nov 2017 17:55:59 +0000 Subject: Revert "Create LongStringDictionary and replace SimpleStringDictionary usages in client/ios/Breakpad.mm." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit fd0a0d2b7ae9dd3d8a02b6a12e7941f7189fbb6c. Reason for revert: Build failures reported at https://chromium-review.googlesource.com/c/chromium/src/+/750591#message-cc4f7dd486fa1da7373ad5d83d56f550d607d429 Failed build on chromium.mac/ios-device: https://build.chromium.org/p/chromium.mac/builders/ios-device/builds/73163, https://logs.chromium.org/v/?s=chromium%2Fbb%2Fchromium.mac%2Fios-device%2F73163%2F%2B%2Frecipes%2Fsteps%2Fcompile%2F0%2Fstdout [637/3593] CXX obj/third_party/breakpad/client/long_string_dictionary.o FAILED: obj/third_party/breakpad/client/long_string_dictionary.o […] ../../third_party/breakpad/breakpad/src/common/long_string_dictionary.cc:46:16: error: unused variable 'kMaxSuffixLength' [-Werror,-Wunused-const-variable] const size_t kMaxSuffixLength = 4; ^ 1 error generated. […] [641/3593] CXX ios_clang_arm64/obj/third_party/breakpad/client/long_string_dictionary.o FAILED: ios_clang_arm64/obj/third_party/breakpad/client/long_string_dictionary.o ../../third_party/breakpad/breakpad/src/common/long_string_dictionary.cc:46:16: error: unused variable 'kMaxSuffixLength' [-Werror,-Wunused-const-variable] const size_t kMaxSuffixLength = 4; ^ 1 error generated. Change-Id: I285eaac6abfcb7d173a0d1e4998b92d5c8dd6ecb Reviewed-on: https://chromium-review.googlesource.com/751723 Reviewed-by: Mark Mentovai --- src/common/simple_string_dictionary.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/common/simple_string_dictionary.h') diff --git a/src/common/simple_string_dictionary.h b/src/common/simple_string_dictionary.h index 28c4bf1c..d2ab17fd 100644 --- a/src/common/simple_string_dictionary.h +++ b/src/common/simple_string_dictionary.h @@ -209,22 +209,20 @@ class NonAllocatingMap { // Given |key|, removes any associated value. |key| must not be NULL. If // the key is not found, this is a noop. - bool RemoveKey(const char* key) { + void RemoveKey(const char* key) { assert(key); if (!key) - return false; + return; Entry* entry = GetEntryForKey(key); if (entry) { entry->key[0] = '\0'; entry->value[0] = '\0'; - return true; } #ifndef NDEBUG assert(GetEntryForKey(key) == NULL); #endif - return false; } // Places a serialized version of the map into |map| and returns the size. -- cgit v1.2.1