From owner-p4-projects@FreeBSD.ORG  Mon Mar 18 20:57:48 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id B337F737; Mon, 18 Mar 2013 20:57:47 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 75449735
 for <perforce@freebsd.org>; Mon, 18 Mar 2013 20:57:47 +0000 (UTC)
 (envelope-from jonathan@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 65D27A56
 for <perforce@freebsd.org>; Mon, 18 Mar 2013 20:57:47 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2IKvlYm038827
 for <perforce@freebsd.org>; Mon, 18 Mar 2013 20:57:47 GMT
 (envelope-from jonathan@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2IKvlac038824
 for perforce@freebsd.org; Mon, 18 Mar 2013 20:57:47 GMT
 (envelope-from jonathan@freebsd.org)
Date: Mon, 18 Mar 2013 20:57:47 GMT
Message-Id: <201303182057.r2IKvlac038824@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jonathan@freebsd.org using -f
From: Jonathan Anderson <jonathan@FreeBSD.org>
Subject: PERFORCE change 223020 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Mar 2013 20:57:48 -0000

http://p4web.freebsd.org/@@223020?ac=10

Change 223020 by jonathan@jonathan-on-joe on 2013/03/18 20:56:59

	Pull from upstream commit ef1741ad.
	
	Obtained from:	https://github.com/CTSRD-TESLA/TESLA/commit/ef1741ade5111a31bdf90353114e103dd9991076

Affected files ...

.. //depot/projects/ctsrd/tesla/src/lib/libtesla/tesla.h#4 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/lib/libtesla/tesla.h#4 (text+ko) ====

@@ -47,8 +47,11 @@
  *  * a counter to ensure uniqueness (__COUNTER__)
  *  * the TESLA context (per-thread or global)
  */
-void __tesla_inline_assertion(const char *filename, int line, int count,
-		__tesla_locality*, ...);
+inline void
+__tesla_inline_assertion(const char *filename, int line, int count,
+	__tesla_locality *loc, ...)
+{
+}
 
 
 /* Only define the following things if doing TESLA analysis, not compiling. */