aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cdb7a341d4 -s ours am skip reason: Change-Id Ic91ee1134eb9cc96b09970635ad26da3e0246910 with SHA-1 010600680d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12469816 Change-Id: I2333a7227516af360143ae0fa8b74d22d84218c6
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: Ic91ee1134eb9cc96b09970635ad26da3e0246910 Change-Id: I5f423ddf18417327d2bff31b1023e043ec57820d
2020-07-23Merge "Create Android.bp for marisa-trie" am: 01a997e6df am: 5479e9926e am: ↵Tony Mak
9213245acc am: c1175ad8ed am: c3a0901d58 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1368636 Change-Id: I8b967437baae9ed108a4924e9c6fa7114773bb1f
2020-07-23Merge "Create Android.bp for marisa-trie" am: 01a997e6df am: 5479e9926e am: ↵Tony Mak
9213245acc am: c1175ad8ed Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1368636 Change-Id: I7613c6b2db63b834d441bc93c3930b32d7f8b7cf
2020-07-23Merge "Create Android.bp for marisa-trie" am: 01a997e6df am: 5479e9926e am: ↵Tony Mak
9213245acc Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1368636 Change-Id: Ifd79e860d43ff2756c64858fb05d85e6fca9788b
2020-07-23Merge "Create Android.bp for marisa-trie" am: 01a997e6df am: 5479e9926eTony Mak
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1368636 Change-Id: Ia73ec701e4f94a4ec23604c6fbf4e8463cb27159
2020-07-23Merge "Create Android.bp for marisa-trie" am: 01a997e6dfTony Mak
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1368636 Change-Id: I7b3928f44dac9bb0a70fd43a69908d6ab60a2810
2020-07-23Merge "Create Android.bp for marisa-trie"Tony Mak
2020-07-22Create Android.bp for marisa-trieTony Mak
Those test files are not gtest based and so they are incompatible with cc_test, so I put them as cc_binary instead. Bug: 161375689 Test: mmm external/marisa-trie/ Change-Id: I54a004a6e4bec4d28cf503558893a92ec526456e
2020-07-20Merge "Merge tag v0.2.6 (e54f296bb52d16693931c8b963744931ef1e37f7)." am: ↵Elliott Hughes
dd2e280359 am: 2ea6e854d5 am: a7cf57e5e4 am: 4362d91ea1 am: 6705e199ca Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1364599 Change-Id: I1cb038177f96183ed4f155ff4761f721cf0a7c9f
2020-07-20Merge "Merge tag v0.2.6 (e54f296bb52d16693931c8b963744931ef1e37f7)." am: ↵Elliott Hughes
dd2e280359 am: 2ea6e854d5 am: a7cf57e5e4 am: 4362d91ea1 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1364599 Change-Id: I728bb96694a7453775e0b5f15093198976a7ab65
2020-07-20Merge "Merge tag v0.2.6 (e54f296bb52d16693931c8b963744931ef1e37f7)." am: ↵Elliott Hughes
dd2e280359 am: 2ea6e854d5 am: a7cf57e5e4 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1364599 Change-Id: I83059d09fbedfa36d595375de0d353eda66a0ea6
2020-07-20Merge "Merge tag v0.2.6 (e54f296bb52d16693931c8b963744931ef1e37f7)." am: ↵Elliott Hughes
dd2e280359 am: 2ea6e854d5 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1364599 Change-Id: I9ff2e7b802aea08024bea3020943b5943a5ebe02
2020-07-20Merge "Merge tag v0.2.6 (e54f296bb52d16693931c8b963744931ef1e37f7)." am: ↵Elliott Hughes
dd2e280359 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1364599 Change-Id: I3d02a474f986d3ee93103700316271aa5a03f417
2020-07-20Merge "Merge tag v0.2.6 (e54f296bb52d16693931c8b963744931ef1e37f7)."Elliott Hughes
2020-07-18Merge "Clean out the obsolete copy of marisa-trie." am: 4c5916d9a6 am: ↵Treehugger Robot
2f9a534d59 am: 010600680d am: 9c6ac41d5a am: 2be7fd434a Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1365038 Change-Id: Id0ae46caa566fdcc51105dc00a5388ea0a58e4a4
2020-07-18Clean out the obsolete copy of marisa-trie. am: 401b906548 am: 6ea3272223 ↵Elliott Hughes
am: 86f16a6c68 am: 821506a720 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12180731 Change-Id: I0dece075a9deb59c22fc51a7a90586032ef8f838
2020-07-18Merge "Clean out the obsolete copy of marisa-trie." am: 4c5916d9a6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1365038 Change-Id: I92ec8fa2984d472b2902d1979f9ea3a34dbff5a5
2020-07-18Merge "Clean out the obsolete copy of marisa-trie." am: 4c5916d9a6 am: ↵Treehugger Robot
2f9a534d59 am: 010600680d am: 9c6ac41d5a Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1365038 Change-Id: Idaeaed74d14b200e9e4d77cc102332398aa4320c
2020-07-18Clean out the obsolete copy of marisa-trie. am: 401b906548 am: 6ea3272223 ↵Elliott Hughes
am: 86f16a6c68 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12180731 Change-Id: I2e95d49ae2d46fd2d210ca02cb187e2af6807bda
2020-07-18Merge "Clean out the obsolete copy of marisa-trie." am: 4c5916d9a6 am: ↵Treehugger Robot
2f9a534d59 am: 010600680d Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1365038 Change-Id: I1f7ee2c5643d10835b4d1c490b4fef3b5fea48fd
2020-07-18Clean out the obsolete copy of marisa-trie. am: 401b906548 am: 6ea3272223Elliott Hughes
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12180731 Change-Id: I8bad16a3aebeca9d1acb5638e89090fd681ea5b8
2020-07-18Merge "Clean out the obsolete copy of marisa-trie." am: 4c5916d9a6 am: ↵Treehugger Robot
2f9a534d59 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1365038 Change-Id: Ic91ee1134eb9cc96b09970635ad26da3e0246910
2020-07-18Clean out the obsolete copy of marisa-trie. am: 401b906548Elliott Hughes
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12180731 Change-Id: Ia0b20cdaa8908ffa770844870da2fb63d38bf3fc
2020-07-18Merge "Clean out the obsolete copy of marisa-trie." am: 4c5916d9a6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1365038 Change-Id: I108760de018e8a4533631534400195e19a53880d
2020-07-17Merge tag v0.2.6 (e54f296bb52d16693931c8b963744931ef1e37f7).Elliott Hughes
Change-Id: Id851d5e289650b09ffbde3cc48444f9ed1cc2a64
2020-07-17Clean out the obsolete copy of marisa-trie.Elliott Hughes
In preparation for the resurrection of this project and a snap to the current version. Bug: http://b/161375689 Test: treehugger Change-Id: I95d01e670be89dc1fa739666a2b9df397633d77d (cherry picked from commit 644fab7770a2f244fb3dae110fff456918e5c1a2)
2020-07-17Clean out the obsolete copy of marisa-trie.Elliott Hughes
In preparation for the resurrection of this project and a snap to the current version. Bug: http://b/161375689 Test: treehugger Change-Id: I95d01e670be89dc1fa739666a2b9df397633d77d
2020-07-16Merge "Clean out the obsolete copy of marisa-trie."Treehugger Robot
2020-07-16Clean out the obsolete copy of marisa-trie.Elliott Hughes
In preparation for the resurrection of this project and a snap to the current version. Bug: http://b/161375689 Test: treehugger Change-Id: I95d01e670be89dc1fa739666a2b9df397633d77d
2020-06-14Update links in README.Susumu Yata
2020-06-14Update README.Susumu Yata
2019-10-14Describe about new configure options in documentation.Susumu Yata
2019-10-14Update a copyright year in COPYING.md.Susumu Yata
2019-10-14Update build instructions in README.md.Susumu Yata
2019-10-13Use the BMI2 PDEP instruction to improve BitVector.select0/1.Susumu Yata
New configure options --enable-bmi and --enable-bmi2 are added.
2018-11-13Use https instead of http in docs.Susumu Yata
2018-11-13Use https instead of http in README.Susumu Yata
2018-11-02Describe about --enable-native-code in documentation.Susumu Yata
Ref: #12
2018-11-02Merge branch 'jakwings-autoconf'Susumu Yata
2018-11-02Merge branch 'autoconf' of https://github.com/jakwings/marisa-trie intoSusumu Yata
jakwings-autoconf
2018-11-02Fix indentationSusumu Yata
2018-11-02Merge pull request #20 from glebm/fix-swapSusumu Yata
Fix `swap` overload
2018-10-03Fix `swap` overloadGleb Mazovetskiy
Use `std::swap` instead of a custom version to avoid "ambiguous call" errors. Previously, this code broke: std::unique_ptr<marisa::Trie> a; // Here, unique_ptr calls `swap` internally using ADL. // Previously, this failed to compile: a.reset(new marisa::Trie());
2018-05-20Fix indentation in README.Susumu Yata
GitHub: #16
2018-05-20Update a version number in README.Susumu Yata
GitHub: #16
2018-05-20Update links in documentation.Susumu Yata
GitHub: #16
2018-05-20Increment the version number.Susumu Yata
2018-05-20Remove null pointer arithmetic to suppress warnings.Susumu Yata
2018-05-20Fix indentation.Susumu Yata
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 22:12:54 +0000