libclaw: apply upstream patch for gcc7.

This commit is contained in:
Jérôme Duval
2018-09-07 18:02:13 +02:00
parent f1437275b9
commit 6db24c7b94
2 changed files with 42 additions and 1 deletions

View File

@@ -18,7 +18,7 @@ Claw stands for \"C++ Library Absolutely Wonderful\"."
HOMEPAGE="http://libclaw.sourceforge.net/"
COPYRIGHT="2008-2014 Julien Jorge"
LICENSE="GNU LGPL v2.1"
REVISION="1"
REVISION="3"
SOURCE_URI="http://sourceforge.net/projects/libclaw/files/libclaw/$portVersion/libclaw-$portVersion.tar.gz"
CHECKSUM_SHA256="0be289da7f43b1892575f14b27860af5d1e1f6961eae11653d64e625fd7924b7"
PATCHES="libclaw-$portVersion.patchset"

View File

@@ -144,3 +144,44 @@ index 73b2b10..c0a8fa5 100755
--
1.8.3.4
From 5850bb81673005cf0101b5470749792989a380eb Mon Sep 17 00:00:00 2001
From: Julien Jorge <julien.jorge@iscool-e.com>
Date: Thu Apr 24 20:39:18 2014 +0200
Subject: Fix various errors pointed by clang on iOS.
---
claw/impl/box_2d.tpp | 4 ++--
claw/impl/rectangle.tpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/claw/impl/box_2d.tpp b/claw/impl/box_2d.tpp
index e4b6936..71f3883 100644
--- a/claw/impl/box_2d.tpp
+++ b/claw/impl/box_2d.tpp
@@ -136,8 +136,8 @@ template<typename U>
claw::math::box_2d<U> claw::math::box_2d<T>::cast_value_type_to() const
{
return claw::math::box_2d<U>
- ( first_point.cast_value_type_to<U>(),
- second_point.cast_value_type_to<U>() );
+ ( first_point.template cast_value_type_to<U>(),
+ second_point.template cast_value_type_to<U>() );
} // box_2d::cast_value_type_to()
/*----------------------------------------------------------------------------*/
diff --git a/claw/impl/rectangle.tpp b/claw/impl/rectangle.tpp
index 9e6f14a..3c3c8f3 100644
--- a/claw/impl/rectangle.tpp
+++ b/claw/impl/rectangle.tpp
@@ -140,7 +140,7 @@ template<typename U>
claw::math::rectangle<U> claw::math::rectangle<T>::cast_value_type_to() const
{
return claw::math::rectangle<U>
- ( position.cast_value_type_to<U>(), (U)width, (U)height );
+ ( position.template cast_value_type_to<U>(), (U)width, (U)height );
} // rectangle::cast_value_type_to()
/*----------------------------------------------------------------------------*/
--
2.17.1