Index: head/graphics/luxrender/files/patch-c++14-fixes =================================================================== --- head/graphics/luxrender/files/patch-c++14-fixes (nonexistent) +++ head/graphics/luxrender/files/patch-c++14-fixes (revision 459838) @@ -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 friend void AddStringAttribute(T &object, + const std::string &name, const std::string &description, +- const boost::function &get, const boost::function set = NULL) { ++ const boost::function &get, const boost::function set = 0x0) { + + AddAttrib(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 Property changes on: head/graphics/luxrender/files/patch-c++14-fixes ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/luxrender14/files/patch-c++14-fixes =================================================================== --- head/graphics/luxrender14/files/patch-c++14-fixes (nonexistent) +++ head/graphics/luxrender14/files/patch-c++14-fixes (revision 459838) @@ -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 friend void AddStringAttribute(T &object, + const std::string &name, const std::string &description, +- const boost::function &get, const boost::function set = NULL) { ++ const boost::function &get, const boost::function set = 0x0) { + + AddAttrib(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 Property changes on: head/graphics/luxrender14/files/patch-c++14-fixes ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property