diff options
| author | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-02-15 15:41:52 +0900 |
|---|---|---|
| committer | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-02-15 19:11:52 +0900 |
| commit | deb9290e423961a945ad7695bb291b8ede6960de (patch) | |
| tree | dcc415c39f873a445b14a6034f02600f0eab7b57 | |
| parent | edb665d221ac4d3fa9e9d9024872a407d754ace2 (diff) | |
| download | android_build_kati-deb9290e423961a945ad7695bb291b8ede6960de.tar.gz android_build_kati-deb9290e423961a945ad7695bb291b8ede6960de.tar.bz2 android_build_kati-deb9290e423961a945ad7695bb291b8ede6960de.zip | |
[C++] Fix DO_SORT_AND_UNIQ_AT_ONCE
| -rw-r--r-- | lcp_msort.cc | 6 | ||||
| -rw-r--r-- | testcase/sort.mk | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lcp_msort.cc b/lcp_msort.cc index 08edf90..30439c6 100644 --- a/lcp_msort.cc +++ b/lcp_msort.cc @@ -20,7 +20,7 @@ #include "strutil.h" -//#define DO_SORT_AND_UNIQ_AT_ONCE +#define DO_SORT_AND_UNIQ_AT_ONCE namespace { @@ -100,7 +100,7 @@ int StringMergeSortAndUniq(const vector<const unsigned char*>& data, k += s1_len - i; } else if (j < s2_len) { - memcpy(&d[k], &s2[j], (s2_len - j) * sizeof(AnnotatedString)); + memmove(&d[k], &s2[j], (s2_len - j) * sizeof(AnnotatedString)); k += s2_len - j; } return k; @@ -155,7 +155,7 @@ void StringMergeSort(const vector<const unsigned char*>& data, if (i < s1_len) memcpy(&d[k], &s1[i], (s1_len - i) * sizeof(AnnotatedString)); else if (j < s2_len) - memcpy(&d[k], &s2[j], (s2_len - j) * sizeof(AnnotatedString)); + memmove(&d[k], &s2[j], (s2_len - j) * sizeof(AnnotatedString)); } #endif diff --git a/testcase/sort.mk b/testcase/sort.mk index 03d0375..bf67a14 100644 --- a/testcase/sort.mk +++ b/testcase/sort.mk @@ -9,3 +9,4 @@ test: echo $(sort $(sp)foo$(sp)) echo $(sort ) echo $(sort device/sample/products/AndroidProducts.mk device/moto/shamu/AndroidProducts.mk device/asus/fugu/AndroidProducts.mk device/asus/deb/AndroidProducts.mk device/asus/flo/AndroidProducts.mk device/generic/arm64/AndroidProducts.mk device/generic/qemu/AndroidProducts.mk device/generic/mini-emulator-x86_64/AndroidProducts.mk device/generic/x86/AndroidProducts.mk device/generic/mips/AndroidProducts.mk device/generic/mini-emulator-x86/AndroidProducts.mk device/generic/mini-emulator-mips/AndroidProducts.mk device/generic/mini-emulator-arm64/AndroidProducts.mk device/generic/mini-emulator-armv7-a-neon/AndroidProducts.mk device/generic/x86_64/AndroidProducts.mk device/generic/armv7-a-neon/AndroidProducts.mk device/htc/flounder/AndroidProducts.mk device/lge/bullhead/AndroidProducts.mk device/lge/hammerhead/AndroidProducts.mk device/huawei/angler/AndroidProducts.mk) + echo $(sort cpplint-art-phony libart libartd libgabi++ libopenjdkjvm libopenjdkjvmd libart) |