aboutsummaryrefslogtreecommitdiff
path: root/graphics/luxrender14/files/patch-c++14-fixes
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/luxrender14/files/patch-c++14-fixes')
-rw-r--r--graphics/luxrender14/files/patch-c++14-fixes40
1 files changed, 0 insertions, 40 deletions
diff --git a/graphics/luxrender14/files/patch-c++14-fixes b/graphics/luxrender14/files/patch-c++14-fixes
deleted file mode 100644
index 6516429721d9..000000000000
--- a/graphics/luxrender14/files/patch-c++14-fixes
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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