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

diff --git a/Makefile b/Makefile
index d82637ea95608198760ec785622391c53ca0d6b8..7ae9a5cd93e8bca81093cfce5b23d7f28b6a50ba 100644 (file)
--- 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 bb0c096ae82be72cc9d7eb2154ff4ff357d0a78b..438cd83d4aed0852849767134fb5d6ff31696144 100644 (file)
--- 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}});
        }