From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Thu, 2 Aug 2018 15:49:49 +0000 (+0200)
Subject: Remove the rather pointless enable_if tests for now. And move to C++14.
X-Git-Tag: 1.8.0~76^2~150
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=41d6cc50b9eede13870a942c3aee78d7647295fd;p=nageru

Remove the rather pointless enable_if tests for now. And move to C++14.
---

diff --git a/Makefile b/Makefile
index d82637e..7ae9a5c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 CXX=g++
 PKG_MODULES := Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions Qt5OpenGL Qt5PrintSupport libjpeg movit
 CXXFLAGS ?= -O2 -g -Wall  # Will be overridden by environment.
-CXXFLAGS += -std=gnu++11 -fPIC $(shell pkg-config --cflags $(PKG_MODULES)) -DMOVIT_SHADER_DIR=\"$(shell pkg-config --variable=shaderdir movit)\" -pthread
+CXXFLAGS += -fPIC $(shell pkg-config --cflags $(PKG_MODULES)) -DMOVIT_SHADER_DIR=\"$(shell pkg-config --variable=shaderdir movit)\" -pthread
 
 LDLIBS=$(shell pkg-config --libs $(PKG_MODULES)) -pthread -lavformat -lavcodec -lavutil -lswscale -lGL
 
diff --git a/flow.cpp b/flow.cpp
index bb0c096..438cd83 100644
--- a/flow.cpp
+++ b/flow.cpp
@@ -268,19 +268,19 @@ public:
 	void render_to(const array<GLuint, num_elements> &textures);
 
 	// Convenience wrappers.
-	void render_to(GLuint texture0, enable_if<num_elements == 1> * = nullptr) {
+	void render_to(GLuint texture0) {
 		render_to({{texture0}});
 	}
 
-	void render_to(GLuint texture0, GLuint texture1, enable_if<num_elements == 2> * = nullptr) {
+	void render_to(GLuint texture0, GLuint texture1) {
 		render_to({{texture0, texture1}});
 	}
 
-	void render_to(GLuint texture0, GLuint texture1, GLuint texture2, enable_if<num_elements == 3> * = nullptr) {
+	void render_to(GLuint texture0, GLuint texture1, GLuint texture2) {
 		render_to({{texture0, texture1, texture2}});
 	}
 
-	void render_to(GLuint texture0, GLuint texture1, GLuint texture2, GLuint texture3, enable_if<num_elements == 4> * = nullptr) {
+	void render_to(GLuint texture0, GLuint texture1, GLuint texture2, GLuint texture3) {
 		render_to({{texture0, texture1, texture2, texture3}});
 	}