From 12e527332abf7d8b05ddfbb64656d67a067fb5fb Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Thu, 21 Mar 2024 18:03:15 +0100
Subject: Compile with C++14 support.

---
 src/Makefile.am       |  1 -
 src/cpp11fix.h        | 38 --------------------------------------
 src/domloader.cc      |  3 +--
 src/inputprocessor.cc |  3 +--
 src/zrwrapper.cc      |  4 ++--
 5 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 src/cpp11fix.h

(limited to 'src')

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>())
-- 
cgit v1.2.3