diff options
author | Bernard Normier <bernard@zeroc.com> | 2017-01-23 20:14:15 +0000 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2017-01-23 20:14:15 +0000 |
commit | 6e19097188811d2185db2670ddc40cf8f5f1f2ba (patch) | |
tree | 085a6ff75c838b4c026395d79ca28b03c0f9da22 | |
parent | Fix to prevent build of translators with cross compilation builds (diff) | |
download | ice-6e19097188811d2185db2670ddc40cf8f5f1f2ba.tar.bz2 ice-6e19097188811d2185db2670ddc40cf8f5f1f2ba.tar.xz ice-6e19097188811d2185db2670ddc40cf8f5f1f2ba.zip |
Fixed Linux armhf build failure
-rw-r--r-- | cpp/include/IceUtil/StringConverter.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/include/IceUtil/StringConverter.h b/cpp/include/IceUtil/StringConverter.h index 1c480a0b1c4..23c26158f20 100644 --- a/cpp/include/IceUtil/StringConverter.h +++ b/cpp/include/IceUtil/StringConverter.h @@ -64,12 +64,14 @@ public: } }; +#ifdef __clang__ // // Explicit template instantiation so that dynamic_cast of derived exported // classes works well with clang, see ICE-7473. // template class ICE_API BasicStringConverter<char>; template class ICE_API BasicStringConverter<wchar_t>; +#endif typedef BasicStringConverter<char> StringConverter; ICE_DEFINE_PTR(StringConverterPtr, StringConverter); |