Date: Sun, 9 Mar 2014 23:34:47 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347709 - head/lang/x10/files Message-ID: <201403092334.s29NYlYu018037@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <cmt@burggraben.net> Approved by: maintainer (Jason Bacon <jwbacon@tds.net>) 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 <x10aux/config.h> + #include <x10aux/ref.h> + #include <x10aux/RTT.h> ++#include <x10aux/basic_functions.h> + #include <x10aux/string_utils.h> + #include <x10aux/atomic_ops.h> + + 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<class T, class U> inline x10_boolean struct_equals(T x, U y); ++ template<class T, class U> inline x10_boolean struct_equals(captured_ref_lval<T> x, U y); ++ template<class T, class U> inline x10_boolean struct_equals(T x, captured_ref_lval<U> y); ++ template<class T, class U> inline x10_boolean struct_equals(captured_ref_lval<T> x, captured_ref_lval<U> y); ++ template<class T, class U> inline x10_boolean struct_equals(captured_struct_lval<T> x, U y); ++ template<class T, class U> inline x10_boolean struct_equals(T x, captured_struct_lval<U> y); ++ template<class T, class U> inline x10_boolean struct_equals(captured_struct_lval<T> x, captured_struct_lval<U> y); ++ + /******* type_name ********/ + + template<class T> inline ref<x10::lang::String> type_name(ref<T> x) { +@@ -362,6 +383,23 @@ + + ref<x10::lang::String> to_string(x10_char v); + ++ /* ++ * Wrapers around to_string to translate null to "null" ++ */ ++ template<class T> ref<x10::lang::String> safe_to_string(ref<T> v) { ++ if (v.isNull()) return string_utils::lit("null"); ++ return to_string(v); ++ } ++ template<class T> ref<x10::lang::String> safe_to_string(captured_ref_lval<T> v) { ++ return safe_to_string(*v); ++ } ++ template<class T> ref<x10::lang::String> safe_to_string(captured_struct_lval<T> v) { ++ return to_string(*v); ++ } ++ template<class T> ref<x10::lang::String> safe_to_string(T v) { ++ return to_string(v); ++ } ++ + + /******* zeroValue ********/ + template<class T> 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<class T> ref<x10::lang::String> safe_to_string(ref<T> v) { +- if (v.isNull()) return string_utils::lit("null"); +- return to_string(v); +- } +- template<class T> ref<x10::lang::String> safe_to_string(captured_ref_lval<T> v) { +- return safe_to_string(*v); +- } +- template<class T> ref<x10::lang::String> safe_to_string(captured_struct_lval<T> v) { +- return to_string(*v); +- } +- template<class T> ref<x10::lang::String> safe_to_string(T v) { +- return to_string(v); +- } + } + + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403092334.s29NYlYu018037>