From owner-svn-ports-head@FreeBSD.ORG Sun Mar 9 23:34:48 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5698A77; Sun, 9 Mar 2014 23:34:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9556C2F4; Sun, 9 Mar 2014 23:34:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s29NYmN2018040; Sun, 9 Mar 2014 23:34:48 GMT (envelope-from gerald@svn.freebsd.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s29NYlYu018037; Sun, 9 Mar 2014 23:34:47 GMT (envelope-from gerald@svn.freebsd.org) Message-Id: <201403092334.s29NYlYu018037@svn.freebsd.org> From: Gerald Pfeifer Date: Sun, 9 Mar 2014 23:34:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347709 - head/lang/x10/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Mar 2014 23:34:48 -0000 Author: gerald Date: Sun Mar 9 23:34:47 2014 New Revision: 347709 URL: http://svnweb.freebsd.org/changeset/ports/347709 QAT: https://qat.redports.org/buildarchive/r347709/ Log: Fix the build with newer compilers (such as GCC 4.7). PR: 187395, 182136 Submitted by: Christoph Moench-Tegeder Approved by: maintainer (Jason Bacon ) Added: head/lang/x10/files/patch-x10.runtime-src-cpp-x10-utils-concurrent-AtomicReference.h (contents, props changed) head/lang/x10/files/patch-x10.runtime-src-cpp-x10aux-basic_functions.h (contents, props changed) head/lang/x10/files/patch-x10.runtime-src-cpp-x10aux-string_utils.h (contents, props changed) Added: head/lang/x10/files/patch-x10.runtime-src-cpp-x10-utils-concurrent-AtomicReference.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/x10/files/patch-x10.runtime-src-cpp-x10-utils-concurrent-AtomicReference.h Sun Mar 9 23:34:47 2014 (r347709) @@ -0,0 +1,11 @@ +--- ../x10.runtime/src-cpp/x10/util/concurrent/AtomicReference.h.orig 2014-03-09 15:50:47.000000000 +0100 ++++ ../x10.runtime/src-cpp/x10/util/concurrent/AtomicReference.h 2014-03-09 15:51:15.000000000 +0100 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include + #include + + Added: head/lang/x10/files/patch-x10.runtime-src-cpp-x10aux-basic_functions.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/x10/files/patch-x10.runtime-src-cpp-x10aux-basic_functions.h Sun Mar 9 23:34:47 2014 (r347709) @@ -0,0 +1,54 @@ +--- ../x10.runtime/src-cpp/x10aux/basic_functions.h.orig 2014-03-09 14:42:17.000000000 +0100 ++++ ../x10.runtime/src-cpp/x10aux/basic_functions.h 2014-03-09 15:44:47.000000000 +0100 +@@ -31,6 +31,27 @@ + + namespace x10aux { + ++ /* prototypes */ ++ inline x10_boolean struct_equals(const x10_double x, const x10_double y); ++ inline x10_boolean struct_equals(const x10_float x, const x10_float y); ++ inline x10_boolean struct_equals(const x10_long x, const x10_long y); ++ inline x10_boolean struct_equals(const x10_int x, const x10_int y); ++ inline x10_boolean struct_equals(const x10_short x, const x10_short y); ++ inline x10_boolean struct_equals(const x10_byte x, const x10_byte y); ++ inline x10_boolean struct_equals(const x10_ulong x, const x10_ulong y); ++ inline x10_boolean struct_equals(const x10_uint x, const x10_uint y); ++ inline x10_boolean struct_equals(const x10_ushort x, const x10_ushort y); ++ inline x10_boolean struct_equals(const x10_ubyte x, const x10_ubyte y); ++ inline x10_boolean struct_equals(const x10_char x, const x10_char y); ++ inline x10_boolean struct_equals(const x10_boolean x, const x10_boolean y); ++ template inline x10_boolean struct_equals(T x, U y); ++ template inline x10_boolean struct_equals(captured_ref_lval x, U y); ++ template inline x10_boolean struct_equals(T x, captured_ref_lval y); ++ template inline x10_boolean struct_equals(captured_ref_lval x, captured_ref_lval y); ++ template inline x10_boolean struct_equals(captured_struct_lval x, U y); ++ template inline x10_boolean struct_equals(T x, captured_struct_lval y); ++ template inline x10_boolean struct_equals(captured_struct_lval x, captured_struct_lval y); ++ + /******* type_name ********/ + + template inline ref type_name(ref x) { +@@ -362,6 +383,23 @@ + + ref to_string(x10_char v); + ++ /* ++ * Wrapers around to_string to translate null to "null" ++ */ ++ template ref safe_to_string(ref v) { ++ if (v.isNull()) return string_utils::lit("null"); ++ return to_string(v); ++ } ++ template ref safe_to_string(captured_ref_lval v) { ++ return safe_to_string(*v); ++ } ++ template ref safe_to_string(captured_struct_lval v) { ++ return to_string(*v); ++ } ++ template ref safe_to_string(T v) { ++ return to_string(v); ++ } ++ + + /******* zeroValue ********/ + template struct Zero { Added: head/lang/x10/files/patch-x10.runtime-src-cpp-x10aux-string_utils.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/x10/files/patch-x10.runtime-src-cpp-x10aux-string_utils.h Sun Mar 9 23:34:47 2014 (r347709) @@ -0,0 +1,27 @@ +--- ../x10.runtime/src-cpp/x10aux/string_utils.h.orig 2014-03-09 14:42:24.000000000 +0100 ++++ ../x10.runtime/src-cpp/x10aux/string_utils.h 2014-03-09 14:45:00.000000000 +0100 +@@ -38,23 +38,6 @@ + char *strdup(const char*); + char *strndup(const char*, x10_int len); + } +- +- /* +- * Wrapers around to_string to translate null to "null" +- */ +- template ref safe_to_string(ref v) { +- if (v.isNull()) return string_utils::lit("null"); +- return to_string(v); +- } +- template ref safe_to_string(captured_ref_lval v) { +- return safe_to_string(*v); +- } +- template ref safe_to_string(captured_struct_lval v) { +- return to_string(*v); +- } +- template ref safe_to_string(T v) { +- return to_string(v); +- } + } + + +