diff options
| -rw-r--r-- | graphics/luxrender/files/patch-c++14-fixes | 40 | ||||
| -rw-r--r-- | graphics/luxrender14/files/patch-c++14-fixes | 40 |
2 files changed, 80 insertions, 0 deletions
diff --git a/graphics/luxrender/files/patch-c++14-fixes b/graphics/luxrender/files/patch-c++14-fixes new file mode 100644 index 000000000000..2391a7e2f783 --- /dev/null +++ b/graphics/luxrender/files/patch-c++14-fixes @@ -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 diff --git a/graphics/luxrender14/files/patch-c++14-fixes b/graphics/luxrender14/files/patch-c++14-fixes new file mode 100644 index 000000000000..6516429721d9 --- /dev/null +++ b/graphics/luxrender14/files/patch-c++14-fixes @@ -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 |