Attachment 130840 Details for Bug 174852 – zthread-2.3.2_2.patch

[patch] zthread-2.3.2_2.patch

zthread-2.3.2_2.patch (text/plain), 1.98 KB, created by Michael Gmelin on 2012-12-31 04:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Gmelin

Created: 2012-12-31 04:00:01 UTC

Size: 1.98 KB

patch

obsolete

>diff -ruN --exclude=CVS ../zthread.orig/Makefile ./Makefile
>--- ../zthread.orig/Makefile	2012-12-31 04:26:47.126767001 +0100
>+++ ./Makefile	2012-12-31 04:29:27.803847188 +0100
>@@ -1,13 +1,9 @@
>-# New ports collection makefile for:	ZThread
>-# Date created:				23 May 2001
>-# Whom:					pvh@egenetics.com
>-#
>-# $FreeBSD: ports/devel/zthread/Makefile,v 1.29 2012/11/17 05:57:07 svnexp Exp $
>-#
>+# Created by: pvh@egenetics.com
>+# $FreeBSD: $
> 
> PORTNAME=	zthread
> PORTVERSION=	2.3.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	SF/${PORTNAME}/ZThread/${PORTVERSION}
> DISTNAME=	ZThread-${PORTVERSION}
>diff -ruN --exclude=CVS ../zthread.orig/files/patch-include__zthread__Guard.h ./files/patch-include__zthread__Guard.h
>--- ../zthread.orig/files/patch-include__zthread__Guard.h	2012-12-31 04:26:47.103633055 +0100
>+++ ./files/patch-include__zthread__Guard.h	2012-12-31 04:42:24.083650068 +0100
>@@ -1,5 +1,32 @@
>---- ./include/zthread/Guard.h.orig	2005-03-12 21:10:09.000000000 -0500
>-+++ ./include/zthread/Guard.h	2009-04-23 15:03:09.000000000 -0400
>+--- ./include/zthread/Guard.h.orig	2005-03-13 03:10:09.000000000 +0100
>++++ ./include/zthread/Guard.h	2012-12-31 04:25:54.167937596 +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,7 +428,7 @@
>+   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));
>+ 
>+   }
>+ 
> @@ -491,7 +491,7 @@
>      
>    try {

Actions: View | Diff

Attachments on bug 174852: 130840