Date: Wed, 24 Jan 2018 12:22:58 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459838 - in head/graphics: luxrender/files luxrender14/files Message-ID: <201801241222.w0OCMwWK098324@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Jan 24 12:22:58 2018 New Revision: 459838 URL: https://svnweb.freebsd.org/changeset/ports/459838 Log: Unbreak the build against Clang 6.0.0 (adheres to C++14 by default). PR: 224989 Added: head/graphics/luxrender/files/patch-c++14-fixes (contents, props changed) head/graphics/luxrender14/files/patch-c++14-fixes (contents, props changed) Added: head/graphics/luxrender/files/patch-c++14-fixes ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/luxrender/files/patch-c++14-fixes Wed Jan 24 12:22:58 2018 (r459838) @@ -0,0 +1,40 @@ +--- core/queryable/queryable.h.orig 2016-05-09 21:21:17 UTC ++++ core/queryable/queryable.h +@@ -194,7 +194,7 @@ class LUX_EXPORT Queryable (public) + } + template<class T> friend void AddStringAttribute(T &object, + const std::string &name, const std::string &description, +- const boost::function<std::string (void)> &get, const boost::function<void (std::string)> set = NULL) { ++ const boost::function<std::string (void)> &get, const boost::function<void (std::string)> set = 0x0) { + + AddAttrib<QueryableStringAttribute>(object, name, description, get, set); + } +--- core/scheduler.cpp.orig 2016-05-09 21:21:17 UTC ++++ core/scheduler.cpp +@@ -43,7 +43,7 @@ void NullTask(Range*){} + + Scheduler::Scheduler(unsigned step) + { +- current_task = NULL; ++ current_task = 0x0; + default_step = step; + state = RUNNING; + +@@ -127,7 +127,7 @@ TaskType Scheduler::GetTask() + condition.wait(lock); + + if(current_task == NullTask) +- return NULL; ++ return 0x0; + + return current_task; + } +@@ -152,7 +152,7 @@ bool Scheduler::EndTask(Thread* thread) + + if(counter == 0) + { +- current_task = NULL; ++ current_task = 0x0; + condition.notify_all(); + } + else Added: head/graphics/luxrender14/files/patch-c++14-fixes ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/luxrender14/files/patch-c++14-fixes Wed Jan 24 12:22:58 2018 (r459838) @@ -0,0 +1,40 @@ +--- core/queryable/queryable.h.orig 2015-01-20 23:10:10 UTC ++++ core/queryable/queryable.h +@@ -194,7 +194,7 @@ class LUX_EXPORT Queryable (public) + } + template<class T> friend void AddStringAttribute(T &object, + const std::string &name, const std::string &description, +- const boost::function<std::string (void)> &get, const boost::function<void (std::string)> set = NULL) { ++ const boost::function<std::string (void)> &get, const boost::function<void (std::string)> set = 0x0) { + + AddAttrib<QueryableStringAttribute>(object, name, description, get, set); + } +--- core/scheduler.cpp.orig 2015-01-20 23:10:10 UTC ++++ core/scheduler.cpp +@@ -43,7 +43,7 @@ void NullTask(Range*){} + + Scheduler::Scheduler(unsigned step) + { +- current_task = NULL; ++ current_task = 0x0; + default_step = step; + state = RUNNING; + +@@ -127,7 +127,7 @@ TaskType Scheduler::GetTask() + condition.wait(lock); + + if(current_task == NullTask) +- return NULL; ++ return 0x0; + + return current_task; + } +@@ -152,7 +152,7 @@ bool Scheduler::EndTask(Thread* thread) + + if(counter == 0) + { +- current_task = NULL; ++ current_task = 0x0; + condition.notify_all(); + } + else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801241222.w0OCMwWK098324>