MSVC doesn't like const Proxy operator*() const.

Fixes #308
This commit is contained in:
Kenneth Heafield 2020-11-04 09:19:53 +00:00 коммит произвёл Alexandre Lissy
Родитель bde9a1dacd
Коммит aef96b57a8
3 изменённых файлов: 18 добавлений и 19 удалений

2
kenlm

@ -1 +1 @@
Subproject commit 689a25aae9171b3ea46bd80d4189f540f35f1a02 Subproject commit 0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9

Просмотреть файл

@ -77,8 +77,7 @@ template <class Proxy> class ProxyIterator {
std::ptrdiff_t operator-(const S &other) const { return I() - other.I(); } std::ptrdiff_t operator-(const S &other) const { return I() - other.I(); }
Proxy operator*() { return p_; } Proxy operator*() const { return p_; }
const Proxy operator*() const { return p_; }
Proxy *operator->() { return &p_; } Proxy *operator->() { return &p_; }
const Proxy *operator->() const { return &p_; } const Proxy *operator->() const { return &p_; }
Proxy operator[](std::ptrdiff_t amount) const { return *(*this + amount); } Proxy operator[](std::ptrdiff_t amount) const { return *(*this + amount); }

Просмотреть файл

@ -147,29 +147,29 @@ system:
namespace: 'project.deepspeech.pyenv.win.18' namespace: 'project.deepspeech.pyenv.win.18'
kenlm: kenlm:
android_arm64_cpu: android_arm64_cpu:
url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.android-arm64/artifacts/public/kenlm.tar.gz" url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.android-arm64/artifacts/public/kenlm.tar.gz"
namespace: "project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.android-arm64" namespace: "project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.android-arm64"
android_armv7_cpu: android_armv7_cpu:
url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.android-armv7/artifacts/public/kenlm.tar.gz" url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.android-armv7/artifacts/public/kenlm.tar.gz"
namespace: "project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.android-armv7" namespace: "project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.android-armv7"
android_x86_64_cpu: android_x86_64_cpu:
url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.android-x86_64/artifacts/public/kenlm.tar.gz" url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.android-x86_64/artifacts/public/kenlm.tar.gz"
namespace: "project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.android-x86_64" namespace: "project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.android-x86_64"
linux_amd64_cpu: linux_amd64_cpu:
url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.cpu/artifacts/public/kenlm.tar.gz" url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.cpu/artifacts/public/kenlm.tar.gz"
namespace: "project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.cpu" namespace: "project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.cpu"
linux_arm64_cpu: linux_arm64_cpu:
url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.arm64/artifacts/public/kenlm.tar.gz" url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.arm64/artifacts/public/kenlm.tar.gz"
namespace: "project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.arm64" namespace: "project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.arm64"
linux_rpi3_cpu: linux_rpi3_cpu:
url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.rpi3/artifacts/public/kenlm.tar.gz" url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.rpi3/artifacts/public/kenlm.tar.gz"
namespace: "project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.rpi3" namespace: "project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.rpi3"
darwin_amd64_cpu: darwin_amd64_cpu:
url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.osx/artifacts/public/kenlm.tar.gz" url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.osx/artifacts/public/kenlm.tar.gz"
namespace: "project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.osx" namespace: "project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.osx"
win_amd64_cpu: win_amd64_cpu:
url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.win/artifacts/public/kenlm.tar.gz" url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.win/artifacts/public/kenlm.tar.gz"
namespace: "project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.win" namespace: "project.deepspeech.kenlm.0c4dd4e8a29a9bcaf22d971a83f4974f1a16d6d9.0.win"
swig: swig:
repo: "https://github.com/lissyx/swig" repo: "https://github.com/lissyx/swig"
sha1: "fec7d5d3179833e37759ffc6532f86344982e26a" sha1: "fec7d5d3179833e37759ffc6532f86344982e26a"