kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make graphics/hugin compilable with clang.

Browse source 
PR:		ports/175427
Submitted by:	Rainer Hurling <rhurlin@gwdg.de>
This commit is contained in:
Vasil Dimov 2013-01-21 09:23:33 +00:00
parent 527f8681bb
commit f683020a82
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=310757
2 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
graphics/hugin/files/patch-src__foreign__flann__util__logger.h Normal file
View file

@ -0,0 +1,10 @@
--- src/foreign/flann/util/logger.h.orig 2013-01-18 09:26:49.000000000 +0200
+++ src/foreign/flann/util/logger.h 2013-01-18 09:26:20.000000000 +0200
@@ -32,6 +32,7 @@
#define LOGGER_H
#include <cstdio>
+#include <stdarg.h>
#include "flann/general.h"
namespace flann

30
graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h Normal file
View file

@ -0,0 +1,30 @@
--- src/foreign/zthread/include/zthread/Guard.h.orig 2011-12-02 18:02:37.253022000 +0100
+++ src/foreign/zthread/include/zthread/Guard.h 2013-01-18 19:08:14.000000000 +0100
@@ -108,7 +108,7 @@
}
template <class LockType>
- static void createScope(LockHolder<LockType>& l, unsigned long ms) {
+ static bool createScope(LockHolder<LockType>& l, unsigned long ms) {
if(Scope1::createScope(l, ms))
if(!Scope2::createScope(l, ms)) {
@@ -428,8 +428,8 @@
template <class U, class V>
Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
- LockingPolicy::shareScope(*this, extract(g));
-
+ LockingPolicy::shareScope(*this, this->extract(g));
+
}
/**
@@ -458,7 +458,7 @@
template <class U, class V>
Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
- LockingPolicy::transferScope(*this, extract(g));
+ LockingPolicy::transferScope(*this, this->extract(g));
}