diff options
Diffstat (limited to 'libs/geometry/test/string_from_type.hpp')
-rw-r--r-- | libs/geometry/test/string_from_type.hpp | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/libs/geometry/test/string_from_type.hpp b/libs/geometry/test/string_from_type.hpp index 178ff2ea0..df0141a58 100644 --- a/libs/geometry/test/string_from_type.hpp +++ b/libs/geometry/test/string_from_type.hpp @@ -1,8 +1,13 @@ // Boost.Geometry (aka GGL, Generic Geometry Library) -// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. -// Copyright (c) 2008-2012 Bruno Lalande, Paris, France. -// Copyright (c) 2009-2012 Mateusz Loskot, London, UK. +// Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands. +// Copyright (c) 2008-2015 Bruno Lalande, Paris, France. +// Copyright (c) 2009-2015 Mateusz Loskot, London, UK. + +// This file was modified by Oracle on 2015. +// Modifications copyright (c) 2015, Oracle and/or its affiliates. + +// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. @@ -55,9 +60,21 @@ template <> struct string_from_type<short int> template <> struct string_from_type<int> { static std::string name() { return "i"; } }; -template <> struct string_from_type<boost::long_long_type> +template <> struct string_from_type<long> { static std::string name() { return "l"; } }; +#if defined(BOOST_HAS_LONG_LONG) +// this is what g++ and clang++ use +template <> struct string_from_type<boost::long_long_type> +{ static std::string name() { return "x"; } }; +#endif + +#if defined(BOOST_HAS_INT128) +// this is what g++ and clang++ use +template <> struct string_from_type<boost::int128_type> +{ static std::string name() { return "n"; } }; +#endif + #if defined(HAVE_TTMATH) template <> struct string_from_type<ttmath_big> { static std::string name() { return "t"; } }; |