From 34bd14628c455af9a73d400ff5caf578a42ec39c Mon Sep 17 00:00:00 2001 From: Arthur Moore Date: Wed, 11 Mar 2015 00:53:20 -0400 Subject: [PATCH] Clang says I was using a c++11 feature without meaning to. It doesn't hurt anything to make the code backward compatible, so doing that. --- src/filters/new_interframe.hpp | 12 ++++++------ src/wx/wxvbam.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/filters/new_interframe.hpp b/src/filters/new_interframe.hpp index 7862490d..0d092d26 100644 --- a/src/filters/new_interframe.hpp +++ b/src/filters/new_interframe.hpp @@ -45,9 +45,9 @@ public: class SmartIB : public interframe_filter { private: - u32 *frm1 = NULL; - u32 *frm2 = NULL; - u32 *frm3 = NULL; + u32 *frm1; + u32 *frm2; + u32 *frm3; public: SmartIB(); ~SmartIB(); @@ -59,9 +59,9 @@ public: class MotionBlurIB : public interframe_filter { private: - u32 *frm1 = NULL; - u32 *frm2 = NULL; - u32 *frm3 = NULL; + u32 *frm1; + u32 *frm2; + u32 *frm3; public: MotionBlurIB(); ~MotionBlurIB(); diff --git a/src/wx/wxvbam.h b/src/wx/wxvbam.h index dde4ba71..be745662 100644 --- a/src/wx/wxvbam.h +++ b/src/wx/wxvbam.h @@ -476,8 +476,8 @@ public: protected: virtual void DrawArea(wxWindowDC&) = 0; virtual void DrawOSD(wxWindowDC&); - filter * myFilter = NULL; - interframe_filter * iFilter = NULL; + filter * myFilter; + interframe_filter * iFilter; int width, height, scale; u8 *todraw; u8 *pixbuf1, *pixbuf2;