]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
common: instantiate strict_si_cast<long> not strict_si_cast<int64_t> 10855/head
authorKefu Chai <kchai@redhat.com>
Sat, 25 Jun 2016 17:02:03 +0000 (01:02 +0800)
committerLoic Dachary <ldachary@redhat.com>
Thu, 25 Aug 2016 07:09:53 +0000 (09:09 +0200)
commit117aa35094c059dbf5770b01ac13a583471e54aa
treea74bca42576ee7b74a819c915fa308e243dd4927
parentd93eda88048d2bcefe4be3ea0aaa6ca0289eabbf
common: instantiate strict_si_cast<long> not strict_si_cast<int64_t>

this fixes the build on armf.

on 32bit platforms, cstdint is very likely to

 typedef long long int int64_t;

this results in compilation error like

 `common/strtol.cc:190:75: error: duplicate explicit instantiation of 'T
 strict_si_cast(const char, std::string) [with T = long long int;
 std::string = std::basic_string]'

 [-fpermissive]
 template int64_t strict_si_cast(const char *str, std::string *err);
 ^`

we can address this by instantiate the primitive type of `long long`
instead of `in64_t`.

Fixes: http://tracker.ceph.com/issues/16398
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 31db4c5f9f725e13e38f3c90744e299e023d02a4)
src/common/strtol.cc