summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac18
-rw-r--r--dggui/label.cc2
-rw-r--r--drumgizmo/enginefactory.cc2
-rw-r--r--drumgizmo/input/alsamidi.cc2
-rw-r--r--drumgizmo/input/jackmidi.cc2
-rw-r--r--plugin/Makefile.mingw32.in2
-rw-r--r--plugingui/drumkittab.cc3
-rw-r--r--src/Makefile.am1
-rw-r--r--src/cpp11fix.h38
-rw-r--r--src/domloader.cc3
-rw-r--r--src/inputprocessor.cc3
-rw-r--r--src/zrwrapper.cc4
-rw-r--r--test/dgreftest/dgreftest.cc2
-rw-r--r--test/scopedfile.cc2
14 files changed, 17 insertions, 67 deletions
diff --git a/configure.ac b/configure.ac
index 28c492d..272b46e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,22 +25,14 @@ dnl Compile with C++11 support.
dnl ===========================
AC_LANG_PUSH([C++])
TMP_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS=-std=c++11
-AC_MSG_CHECKING([whether CXX supports -std=c++11])
+CXXFLAGS=-std=c++14
+AC_MSG_CHECKING([whether CXX supports -std=c++14])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
[AC_MSG_RESULT([yes])],
[
- AC_MSG_RESULT([no])
- CXXFLAGS=-std=c++0x
- AC_MSG_CHECKING([whether CXX supports -std=c++0x])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
- [AC_MSG_RESULT([yes])],
- [
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([Compiler does not support c++11])
- ]
- )
-]
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Compiler does not support c++14])
+ ]
)
CXXFLAGS="$TMP_CXXFLAGS $CXXFLAGS"
OBJCXXFLAGS="$OBJCXXFLAGS $CXXFLAGS"
diff --git a/dggui/label.cc b/dggui/label.cc
index fc3f60e..81b853c 100644
--- a/dggui/label.cc
+++ b/dggui/label.cc
@@ -29,7 +29,7 @@
#include "painter.h"
#include "guievent.h"
-#include <cpp11fix.h>
+#include <memory>
namespace dggui
{
diff --git a/drumgizmo/enginefactory.cc b/drumgizmo/enginefactory.cc
index 6d267c3..46a8e6b 100644
--- a/drumgizmo/enginefactory.cc
+++ b/drumgizmo/enginefactory.cc
@@ -26,7 +26,7 @@
*/
#include <iostream>
-#include "cpp11fix.h" // required for c++11
+#include <memory>
#include "enginefactory.h"
EngineFactory::EngineFactory()
diff --git a/drumgizmo/input/alsamidi.cc b/drumgizmo/input/alsamidi.cc
index 068ea2b..fd25f52 100644
--- a/drumgizmo/input/alsamidi.cc
+++ b/drumgizmo/input/alsamidi.cc
@@ -25,7 +25,7 @@
#include <iostream>
#include <cassert>
-#include "cpp11fix.h" // required for c++11
+#include <memory>
#include "alsamidi.h"
struct AlsaMidiInitError
diff --git a/drumgizmo/input/jackmidi.cc b/drumgizmo/input/jackmidi.cc
index 7081bf1..9455bce 100644
--- a/drumgizmo/input/jackmidi.cc
+++ b/drumgizmo/input/jackmidi.cc
@@ -27,7 +27,7 @@
#include <iostream>
#include <cassert>
-#include "cpp11fix.h" // required for c++11
+#include <memory>
#include "jackmidi.h"
JackMidiInputEngine::JackMidiInputEngine(JackClient& client)
diff --git a/plugin/Makefile.mingw32.in b/plugin/Makefile.mingw32.in
index ad47bcc..78444a9 100644
--- a/plugin/Makefile.mingw32.in
+++ b/plugin/Makefile.mingw32.in
@@ -195,7 +195,7 @@ all:
g++ $(CXXFLAGS) -I@top_srcdir@ @top_srcdir@/plugingui/resource_data.cc -c
gcc $(CFLAGS) $(DBG_CFLAGS) @top_srcdir@/hugin/hugin.c -c
gcc $(CFLAGS) $(DBG_CFLAGS) @top_srcdir@/hugin/hugin_syslog.c -c
- g++ $(LDFLAGS) $(CXXFLAGS) -std=c++11 -static -static-libgcc -O2 -g -Wall $(DBG_CFLAGS) $(DG_CFLAGS) $(DG_LIBS) $(VST_CFLAGS) hugin.o hugin_syslog.o resource_data.o $(DG_SRC) $(VST_SRC) ${SRC} ${GUI_SRC} ${GUI_CPPFLAGS} $(GUI_LIBS) $(SNDFILE_CFLAGS) $(SNDFILE_LIBS) -latomic -shared -Wl,-retain-symbols-file -Wl,drumgizmo_vst.sym -o drumgizmo_vst.dll -Wl,--out-implib,libdrumgizmo_vst.a
+ g++ $(LDFLAGS) $(CXXFLAGS) -std=c++14 -static -static-libgcc -O2 -g -Wall $(DBG_CFLAGS) $(DG_CFLAGS) $(DG_LIBS) $(VST_CFLAGS) hugin.o hugin_syslog.o resource_data.o $(DG_SRC) $(VST_SRC) ${SRC} ${GUI_SRC} ${GUI_CPPFLAGS} $(GUI_LIBS) $(SNDFILE_CFLAGS) $(SNDFILE_LIBS) -latomic -shared -Wl,-retain-symbols-file -Wl,drumgizmo_vst.sym -o drumgizmo_vst.dll -Wl,--out-implib,libdrumgizmo_vst.a
clean:
del -f drumgizmo_vst.dll libdrumgizmo_vst.a
diff --git a/plugingui/drumkittab.cc b/plugingui/drumkittab.cc
index 6323e94..515f4c9 100644
--- a/plugingui/drumkittab.cc
+++ b/plugingui/drumkittab.cc
@@ -29,8 +29,7 @@
#include <algorithm>
#include <iomanip>
#include <sstream>
-
-#include "cpp11fix.h" // required for c++11
+#include <memory>
#include <dggui/painter.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index ff02883..9fedc1f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -100,7 +100,6 @@ EXTRA_DIST = \
configfile.h \
configparser.h \
directory.h \
- cpp11fix.h \
dgxmlparser.h \
domloader.h \
drumgizmo.h \
diff --git a/src/cpp11fix.h b/src/cpp11fix.h
deleted file mode 100644
index c6512ae..0000000
--- a/src/cpp11fix.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/***************************************************************************
- * cpp11fix.h
- *
- * Mi 20. Jan 10:22:36 CET 2016
- * Copyright 2016 Christian Glöckner
- * cgloeckner@freenet.de
- ****************************************************************************/
-
-/*
- * This file is part of DrumGizmo.
- *
- * DrumGizmo is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * DrumGizmo is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with DrumGizmo; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-#pragma once
-
-#include <memory>
-
-namespace std {
-
-template <typename T, typename ...Args>
-std::unique_ptr<T> make_unique(Args&& ...args) {
- return std::unique_ptr<T>{new T{std::forward<Args>(args)...}};
-}
-
-} // std
diff --git a/src/domloader.cc b/src/domloader.cc
index c78ed75..57f1d12 100644
--- a/src/domloader.cc
+++ b/src/domloader.cc
@@ -27,6 +27,7 @@
#include "domloader.h"
#include <unordered_map>
+#include <memory>
#include <hugin.hpp>
@@ -35,8 +36,6 @@
#include "path.h"
#include "channel.h"
-#include "cpp11fix.h"
-
struct channel_attribute_t
{
std::string cname;
diff --git a/src/inputprocessor.cc b/src/inputprocessor.cc
index c0c0e92..eda8520 100644
--- a/src/inputprocessor.cc
+++ b/src/inputprocessor.cc
@@ -27,6 +27,7 @@
#include "inputprocessor.h"
#include <list>
+#include <memory>
#include <hugin.hpp>
@@ -37,8 +38,6 @@
#include "staminafilter.h"
#include "velocityfilter.h"
-#include "cpp11fix.h"
-
class VelocityStorer
: public InputFilter
{
diff --git a/src/zrwrapper.cc b/src/zrwrapper.cc
index 29559fc..755db2d 100644
--- a/src/zrwrapper.cc
+++ b/src/zrwrapper.cc
@@ -26,9 +26,9 @@
*/
#include "zrwrapper.h"
-#include <zita-resampler/resampler.h>
+#include <memory>
-#include "cpp11fix.h"
+#include <zita-resampler/resampler.h>
ZRWrapper::ZRWrapper()
: resampler(std::make_unique<Resampler>())
diff --git a/test/dgreftest/dgreftest.cc b/test/dgreftest/dgreftest.cc
index a4eb897..dc7e45d 100644
--- a/test/dgreftest/dgreftest.cc
+++ b/test/dgreftest/dgreftest.cc
@@ -39,7 +39,7 @@
#include "midiinputengine.h"
#include "wavfileoutputengine.h"
-#include <cpp11fix.h> // required for c++11
+#include <memory>
std::unique_ptr<AudioOutputEngine> createOutput(const std::string& name)
{
diff --git a/test/scopedfile.cc b/test/scopedfile.cc
index 3c30734..763494e 100644
--- a/test/scopedfile.cc
+++ b/test/scopedfile.cc
@@ -29,7 +29,7 @@
#include <cstdlib>
#include <unistd.h>
-#include <cpp11fix.h>
+#include <memory>
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 21:01:26 +0000