diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-19 10:12:23 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-21 14:05:40 -0700 |
commit | 2df1c36ab82af663c6f612da2ffda1fdc13531c2 (patch) | |
tree | 0fde1733d2fcb2ee15967da15035716154c35618 /src/mbgl/util | |
parent | a14f0d2eddd4d9eb1bbf33fed3bfffe2329acf5e (diff) | |
download | qtlocation-mapboxgl-2df1c36ab82af663c6f612da2ffda1fdc13531c2.tar.gz |
[core] JoinType ⇢ LineJoinType
Diffstat (limited to 'src/mbgl/util')
-rw-r--r-- | src/mbgl/util/interpolate.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/util/interpolate.hpp b/src/mbgl/util/interpolate.hpp index 499783342f..7d8627e7d6 100644 --- a/src/mbgl/util/interpolate.hpp +++ b/src/mbgl/util/interpolate.hpp @@ -39,7 +39,7 @@ template<> inline std::string interpolate(const std::string a, const std::string template<> inline TranslateAnchorType interpolate(const TranslateAnchorType a, const TranslateAnchorType, const double) { return a; } template<> inline RotateAnchorType interpolate(const RotateAnchorType a, const RotateAnchorType, const double) { return a; } template<> inline LineCapType interpolate(const LineCapType a, const LineCapType, const double) { return a; } -template<> inline JoinType interpolate(const JoinType a, const JoinType, const double) { return a; } +template<> inline LineJoinType interpolate(const LineJoinType a, const LineJoinType, const double) { return a; } template<> inline PlacementType interpolate(const PlacementType a, const PlacementType, const double) { return a; } template<> inline TextAnchorType interpolate(const TextAnchorType a, const TextAnchorType, const double) { return a; } template<> inline TextJustifyType interpolate(const TextJustifyType a, const TextJustifyType, const double) { return a; } |