commit 17116a6ce8cc1bbb1297c4ec337c69f2b09e39d4
author Chih-Hung Hsieh <chh@google.com> Fri Oct 05 12:43:33 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 05 12:43:33 2018 -0700
tree 26553ab2420d4a026d767b7f6c38ae45a48322a1
parent 0792c7842ec5917e85558b16e0191c7f4164a833
parent 9c58fe67f0eb26d9b1c3926a13008e5fb0c1a035

Merge "Add noexcept to move constructors and assignment operators." am: 61d3a1d39b am: 587239f195
am: 9c58fe67f0

Change-Id: I926433188e61eef7f4947167e51b1afae407d9fc

native/jni/src/dictionary/utils/binary_dictionary_bigrams_iterator.h

diff --git a/native/jni/src/dictionary/utils/binary_dictionary_bigrams_iterator.h b/native/jni/src/dictionary/utils/binary_dictionary_bigrams_iterator.h
index 8a61473..a303364 100644
--- a/native/jni/src/dictionary/utils/binary_dictionary_bigrams_iterator.h
+++ b/native/jni/src/dictionary/utils/binary_dictionary_bigrams_iterator.h
@@ -35,7 +35,7 @@
               mBigramPos(NOT_A_DICT_POS), mProbability(NOT_A_PROBABILITY),
               mHasNext(pos != NOT_A_DICT_POS) {}
 
-    BinaryDictionaryBigramsIterator(BinaryDictionaryBigramsIterator &&bigramsIterator)
+    BinaryDictionaryBigramsIterator(BinaryDictionaryBigramsIterator &&bigramsIterator) noexcept
             : mBigramsStructurePolicy(bigramsIterator.mBigramsStructurePolicy),
               mPos(bigramsIterator.mPos), mBigramPos(bigramsIterator.mBigramPos),
               mProbability(bigramsIterator.mProbability), mHasNext(bigramsIterator.mHasNext) {}

native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h

diff --git a/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h b/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h
index a4ddd58..e14805e 100644
--- a/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h
+++ b/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h
@@ -31,7 +31,7 @@
               mPos(shortcutStructurePolicy->getStartPos(shortcutPos)),
               mHasNextShortcutTarget(shortcutPos != NOT_A_DICT_POS) {}
 
-    BinaryDictionaryShortcutIterator(const BinaryDictionaryShortcutIterator &&shortcutIterator)
+    BinaryDictionaryShortcutIterator(const BinaryDictionaryShortcutIterator &&shortcutIterator) noexcept
             : mShortcutStructurePolicy(shortcutIterator.mShortcutStructurePolicy),
               mPos(shortcutIterator.mPos),
               mHasNextShortcutTarget(shortcutIterator.mHasNextShortcutTarget) {}