diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-29 10:36:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-29 10:36:50 +0000 |
| commit | 240e7b14c8aef0245600a867f9dd0c6c2c3dde15 (patch) | |
| tree | f68e9f2c95cfb02b54d9697d8b4a2ae0be2d546c | |
| parent | a20471031e4694bfa083482d0465f9e28c93e454 (diff) | |
| parent | 77657a57f903b67b0c70ee5de2c4477d0d53c2e7 (diff) | |
| download | marisa-trie-240e7b14c8aef0245600a867f9dd0c6c2c3dde15.tar.gz | |
Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1c am: b2c0024b8a am: 0f1f759109 am: c39e1b2fde am: 77657a57f9
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1440831
Change-Id: I480d4c36a7e8f46deb0784d4edb7b2692ce9f16d
| -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); } |