luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31 from pankajp/patch-1 

Fix compilation with `-with-64bit-coord`
This commit is contained in:
Matthias Köfferlein 2017-12-06 20:57:10 +01:00 committed by GitHub
parent b115e71dd1 f318cb2e30
commit 800ac4ad7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/tl/tl/tlString.cc
View File

@ -231,6 +231,32 @@ tl::to_string (const unsigned long long &d)
return os.str ();
}
#if defined(HAVE_64BIT_COORD)
template <>
std::string
tl::to_string (const __int128 &d)
{
if (d < 0 ) {
return "-" + tl::to_string(static_cast<unsigned __int128>(-d));
} else {
return tl::to_string(static_cast<unsigned __int128>(d));
}
}
template <>
std::string
tl::to_string (const unsigned __int128 &d)
{
if (static_cast<uint64_t>(d) == d) {
return tl::to_string(static_cast<uint64_t>(d));
}
std::ostringstream os;
os.imbue (c_locale);
os << "0x" << std::hex << static_cast<uint64_t> (d>>64) << static_cast<uint64_t> (d);
return os.str ();
}
#endif
template <>
std::string
tl::to_string (char * const &cp)

4
src/tl/tl/tlString.h
View File

@ -271,6 +271,10 @@ template <> TL_PUBLIC std::string to_string (const long &d);
template <> TL_PUBLIC std::string to_string (const unsigned long &d);
template <> TL_PUBLIC std::string to_string (const long long &d);
template <> TL_PUBLIC std::string to_string (const unsigned long long &d);
#if defined(HAVE_64BIT_COORD)
template <> TL_PUBLIC std::string to_string (const __int128 &d);
template <> TL_PUBLIC std::string to_string (const unsigned __int128 &d);
#endif
template <> TL_PUBLIC std::string to_string (const char * const &cp);
template <> TL_PUBLIC std::string to_string (char * const &cp);
template <> TL_PUBLIC std::string to_string (const unsigned char * const &cp);

2
src/tl/tl/tlVariant.cc
View File

@ -2189,7 +2189,7 @@ QVariant Variant::to_qvariant () const
#if defined(HAVE_64BIT_COORD)
case t_int128:
// TODO: support for int128 in QVariant?
return QVariant ((double) m_var.m_m128);
return QVariant ((double) m_var.m_int128);
#endif
case t_bool:
return QVariant (m_var.m_bool);