From b97192abd39319db3115a6312848ce0f025dee5f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 5 Feb 2017 21:02:40 +0100
Subject: [PATCH] Use std::make_unique provided by C++14

---
 CMakeLists.txt                    | 2 +-
 abstractattachment.cpp            | 2 +-
 avc/avcinfo.cpp                   | 2 +-
 flac/flacmetadata.cpp             | 2 +-
 flac/flacstream.h                 | 3 +--
 genericcontainer.h                | 3 +--
 genericfileelement.h              | 1 -
 id3/id3v2frame.cpp                | 2 +-
 matroska/ebmlelement.cpp          | 2 +-
 matroska/matroskaattachment.cpp   | 3 ++-
 matroska/matroskachapter.cpp      | 3 ++-
 matroska/matroskacontainer.cpp    | 2 +-
 matroska/matroskaeditionentry.cpp | 2 +-
 matroska/matroskatagfield.cpp     | 3 ++-
 mediafileinfo.cpp                 | 2 +-
 mp4/mp4container.cpp              | 2 +-
 mp4/mp4tagfield.cpp               | 1 -
 mp4/mpeg4descriptor.h             | 2 +-
 ogg/oggcontainer.cpp              | 3 ++-
 tagvalue.h                        | 1 -
 vorbis/vorbiscomment.cpp          | 2 +-
 vorbis/vorbiscommentfield.cpp     | 2 +-
 22 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9473309..f4cbfe5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,7 +160,7 @@ set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}")
 set(META_APP_DESCRIPTION "C++ library for reading and writing MP4 (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags")
 set(META_VERSION_MAJOR 6)
 set(META_VERSION_MINOR 2)
-set(META_VERSION_PATCH 0)
+set(META_VERSION_PATCH 1)
 set(META_PUBLIC_SHARED_LIB_DEPENDS c++utilities)
 set(META_PUBLIC_STATIC_LIB_DEPENDS c++utilities_static)
 set(META_PRIVATE_COMPILE_DEFINITIONS LEGACY_API)
diff --git a/abstractattachment.cpp b/abstractattachment.cpp
index a00a7e4..020fab0 100644
--- a/abstractattachment.cpp
+++ b/abstractattachment.cpp
@@ -3,11 +3,11 @@
 #include "./mediafileinfo.h"
 #include "./exceptions.h"
 
-#include <c++utilities/misc/memory.h>
 #include <c++utilities/io/catchiofailure.h>
 #include <c++utilities/io/copy.h>
 
 #include <sstream>
+#include <memory>
 
 using namespace std;
 using namespace IoUtilities;
diff --git a/avc/avcinfo.cpp b/avc/avcinfo.cpp
index bfae3a4..3f217d4 100644
--- a/avc/avcinfo.cpp
+++ b/avc/avcinfo.cpp
@@ -4,10 +4,10 @@
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/bitreader.h>
-#include <c++utilities/misc/memory.h>
 #include <c++utilities/io/catchiofailure.h>
 
 #include <unordered_map>
+#include <memory>
 
 using namespace std;
 using namespace IoUtilities;
diff --git a/flac/flacmetadata.cpp b/flac/flacmetadata.cpp
index 3a73401..f73f512 100644
--- a/flac/flacmetadata.cpp
+++ b/flac/flacmetadata.cpp
@@ -7,9 +7,9 @@
 #include <c++utilities/io/bitreader.h>
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>
-#include <c++utilities/misc/memory.h>
 
 #include <cstring>
+#include <memory>
 
 using namespace std;
 using namespace ConversionUtilities;
diff --git a/flac/flacstream.h b/flac/flacstream.h
index 8d94678..80e0922 100644
--- a/flac/flacstream.h
+++ b/flac/flacstream.h
@@ -3,9 +3,8 @@
 
 #include "../abstracttrack.h"
 
-#include <c++utilities/misc/memory.h>
-
 #include <iosfwd>
+#include <memory>
 
 namespace Media {
 
diff --git a/genericcontainer.h b/genericcontainer.h
index 631eb40..73ca8dd 100644
--- a/genericcontainer.h
+++ b/genericcontainer.h
@@ -3,11 +3,10 @@
 
 #include "./abstractcontainer.h"
 
-#include <c++utilities/misc/memory.h>
-
 #include <algorithm>
 #include <memory>
 #include <vector>
+#include <memory>
 
 namespace Media {
 
diff --git a/genericfileelement.h b/genericfileelement.h
index e1ba5f9..9c76ce8 100644
--- a/genericfileelement.h
+++ b/genericfileelement.h
@@ -7,7 +7,6 @@
 
 #include <c++utilities/conversion/types.h>
 #include <c++utilities/io/copy.h>
-#include <c++utilities/misc/memory.h>
 
 #include <list>
 #include <initializer_list>
diff --git a/id3/id3v2frame.cpp b/id3/id3v2frame.cpp
index eb4355c..091c6f5 100644
--- a/id3/id3v2frame.cpp
+++ b/id3/id3v2frame.cpp
@@ -6,12 +6,12 @@
 
 #include <c++utilities/conversion/stringconversion.h>
 #include <c++utilities/conversion/stringbuilder.h>
-#include <c++utilities/misc/memory.h>
 
 #include <zlib.h>
 
 #include <algorithm>
 #include <cstring>
+#include <memory>
 
 using namespace std;
 using namespace ConversionUtilities;
diff --git a/matroska/ebmlelement.cpp b/matroska/ebmlelement.cpp
index 27d9917..00df646 100644
--- a/matroska/ebmlelement.cpp
+++ b/matroska/ebmlelement.cpp
@@ -9,11 +9,11 @@
 #include <c++utilities/conversion/binaryconversion.h>
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>
-#include <c++utilities/misc/memory.h>
 
 #include <string>
 #include <sstream>
 #include <cstring>
+#include <memory>
 
 using namespace std;
 using namespace IoUtilities;
diff --git a/matroska/matroskaattachment.cpp b/matroska/matroskaattachment.cpp
index f438bf8..87e3671 100644
--- a/matroska/matroskaattachment.cpp
+++ b/matroska/matroskaattachment.cpp
@@ -5,7 +5,8 @@
 
 #include <c++utilities/conversion/binaryconversion.h>
 #include <c++utilities/conversion/stringbuilder.h>
-#include <c++utilities/misc/memory.h>
+
+#include <memory>
 
 using namespace std;
 using namespace ConversionUtilities;
diff --git a/matroska/matroskachapter.cpp b/matroska/matroskachapter.cpp
index 5eb51c5..1a51c66 100644
--- a/matroska/matroskachapter.cpp
+++ b/matroska/matroskachapter.cpp
@@ -3,7 +3,8 @@
 #include "./matroskaid.h"
 
 #include <c++utilities/conversion/stringbuilder.h>
-#include <c++utilities/misc/memory.h>
+
+#include <memory>
 
 using namespace std;
 using namespace ChronoUtilities;
diff --git a/matroska/matroskacontainer.cpp b/matroska/matroskacontainer.cpp
index b8f1c86..c85d557 100644
--- a/matroska/matroskacontainer.cpp
+++ b/matroska/matroskacontainer.cpp
@@ -14,13 +14,13 @@
 #include <c++utilities/conversion/stringconversion.h>
 #include <c++utilities/conversion/stringbuilder.h>
 #include <c++utilities/io/catchiofailure.h>
-#include <c++utilities/misc/memory.h>
 
 #include <unistd.h>
 
 #include <functional>
 #include <initializer_list>
 #include <unordered_set>
+#include <memory>
 
 using namespace std;
 using namespace std::placeholders;
diff --git a/matroska/matroskaeditionentry.cpp b/matroska/matroskaeditionentry.cpp
index 5cf6c52..7495a92 100644
--- a/matroska/matroskaeditionentry.cpp
+++ b/matroska/matroskaeditionentry.cpp
@@ -4,9 +4,9 @@
 
 #include <c++utilities/conversion/stringbuilder.h>
 #include <c++utilities/conversion/stringconversion.h>
-#include <c++utilities/misc/memory.h>
 
 #include <string>
+#include <memory>
 
 using namespace std;
 using namespace ConversionUtilities;
diff --git a/matroska/matroskatagfield.cpp b/matroska/matroskatagfield.cpp
index 5a2d8f6..95e57fb 100644
--- a/matroska/matroskatagfield.cpp
+++ b/matroska/matroskatagfield.cpp
@@ -5,7 +5,8 @@
 #include "../exceptions.h"
 
 #include <c++utilities/io/binarywriter.h>
-#include <c++utilities/misc/memory.h>
+
+#include <memory>
 
 using namespace std;
 using namespace IoUtilities;
diff --git a/mediafileinfo.cpp b/mediafileinfo.cpp
index 810c355..5affed8 100644
--- a/mediafileinfo.cpp
+++ b/mediafileinfo.cpp
@@ -33,7 +33,6 @@
 #include <c++utilities/conversion/stringconversion.h>
 #include <c++utilities/io/catchiofailure.h>
 #include <c++utilities/chrono/timespan.h>
-#include <c++utilities/misc/memory.h>
 
 #include <unistd.h>
 
@@ -43,6 +42,7 @@
 #include <ios>
 #include <system_error>
 #include <functional>
+#include <memory>
 
 using namespace std;
 using namespace std::placeholders;
diff --git a/mp4/mp4container.cpp b/mp4/mp4container.cpp
index 6eeb7fd..bacda04 100644
--- a/mp4/mp4container.cpp
+++ b/mp4/mp4container.cpp
@@ -10,12 +10,12 @@
 #include <c++utilities/io/binarywriter.h>
 #include <c++utilities/io/copy.h>
 #include <c++utilities/io/catchiofailure.h>
-#include <c++utilities/misc/memory.h>
 
 #include <unistd.h>
 
 #include <tuple>
 #include <numeric>
+#include <memory>
 
 using namespace std;
 using namespace IoUtilities;
diff --git a/mp4/mp4tagfield.cpp b/mp4/mp4tagfield.cpp
index b3a365a..86e5239 100644
--- a/mp4/mp4tagfield.cpp
+++ b/mp4/mp4tagfield.cpp
@@ -8,7 +8,6 @@
 #include <c++utilities/conversion/stringbuilder.h>
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>
-#include <c++utilities/misc/memory.h>
 
 #include <algorithm>
 #include <memory>
diff --git a/mp4/mpeg4descriptor.h b/mp4/mpeg4descriptor.h
index 58c2a2a..68f1c7b 100644
--- a/mp4/mpeg4descriptor.h
+++ b/mp4/mpeg4descriptor.h
@@ -3,7 +3,7 @@
 
 #include "../genericfileelement.h"
 
-#include <c++utilities/misc/memory.h>
+#include <memory>
 
 namespace Media {
 
diff --git a/ogg/oggcontainer.cpp b/ogg/oggcontainer.cpp
index c8db4b5..ae6fa3e 100644
--- a/ogg/oggcontainer.cpp
+++ b/ogg/oggcontainer.cpp
@@ -8,7 +8,8 @@
 #include <c++utilities/conversion/stringbuilder.h>
 #include <c++utilities/io/copy.h>
 #include <c++utilities/io/catchiofailure.h>
-#include <c++utilities/misc/memory.h>
+
+#include <memory>
 
 using namespace std;
 using namespace IoUtilities;
diff --git a/tagvalue.h b/tagvalue.h
index 6d7d8d8..343075f 100644
--- a/tagvalue.h
+++ b/tagvalue.h
@@ -6,7 +6,6 @@
 #include <c++utilities/conversion/binaryconversion.h>
 #include <c++utilities/chrono/timespan.h>
 #include <c++utilities/chrono/datetime.h>
-#include <c++utilities/misc/memory.h>
 
 #include <iosfwd>
 #include <string>
diff --git a/vorbis/vorbiscomment.cpp b/vorbis/vorbiscomment.cpp
index f297cbe..5f8c067 100644
--- a/vorbis/vorbiscomment.cpp
+++ b/vorbis/vorbiscomment.cpp
@@ -8,9 +8,9 @@
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>
 #include <c++utilities/io/copy.h>
-#include <c++utilities/misc/memory.h>
 
 #include <map>
+#include <memory>
 
 using namespace std;
 using namespace IoUtilities;
diff --git a/vorbis/vorbiscommentfield.cpp b/vorbis/vorbiscommentfield.cpp
index 31842b0..0f2181f 100644
--- a/vorbis/vorbiscommentfield.cpp
+++ b/vorbis/vorbiscommentfield.cpp
@@ -14,9 +14,9 @@
 #include <c++utilities/io/catchiofailure.h>
 #include <c++utilities/conversion/binaryconversion.h>
 #include <c++utilities/conversion/stringconversion.h>
-#include <c++utilities/misc/memory.h>
 
 #include <iostream>
+#include <memory>
 
 using namespace std;
 using namespace IoUtilities;