Merge pull request #32 from tony-mak/master

Use MARISA_DEBUG_IF in scoped-*.h as opposed to MARISA_THROW_IF
s-yata · Sep 26, 2020 · 006020c · 006020c
2 parents ca018e9 + 88c6d93
commit 006020c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
   }