diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-29 09:30:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-29 09:30:02 +0000 |
| commit | 0f1f7591096ba51f96edc136f6790db97a7f237e (patch) | |
| tree | f68e9f2c95cfb02b54d9697d8b4a2ae0be2d546c | |
| parent | 570fb1d38e8abb330cebe0d6f230648b51cb9af4 (diff) | |
| parent | b2c0024b8a5f775f9df7f850fc3a2f1ef71376c1 (diff) | |
| download | marisa-trie-0f1f7591096ba51f96edc136f6790db97a7f237e.tar.gz | |
Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1c am: b2c0024b8a
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1440831
Change-Id: I9962895832b419a786fba54a587d838754ae1fae
| -rw-r--r-- | include/marisa/scoped-array.h | 2 | ||||
| -rw-r--r-- | include/marisa/scoped-ptr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/marisa/scoped-array.h b/include/marisa/scoped-array.h index 12b5b9e..34cefa4 100644 --- a/include/marisa/scoped-array.h +++ b/include/marisa/scoped-array.h @@ -16,7 +16,7 @@ class scoped_array { } void reset(T *array = NULL) { - MARISA_THROW_IF((array != NULL) && (array == array_), MARISA_RESET_ERROR); + MARISA_DEBUG_IF((array != NULL) && (array == array_), MARISA_RESET_ERROR); scoped_array(array).swap(*this); } diff --git a/include/marisa/scoped-ptr.h b/include/marisa/scoped-ptr.h index 63d7a3d..abf48d8 100644 --- a/include/marisa/scoped-ptr.h +++ b/include/marisa/scoped-ptr.h @@ -16,7 +16,7 @@ class scoped_ptr { } void reset(T *ptr = NULL) { - MARISA_THROW_IF((ptr != NULL) && (ptr == ptr_), MARISA_RESET_ERROR); + MARISA_DEBUG_IF((ptr != NULL) && (ptr == ptr_), MARISA_RESET_ERROR); scoped_ptr(ptr).swap(*this); } |