Restore GCC 5 compatibility (#11778)

diff --git a/src/client/client.h b/src/client/client.h
index b92b456f468e9eee39780fc304b46d7cee56de06..bae40f389a72ee493b3e2691358f7b9c0bc08067 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -548,7 +548,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        // Set of media filenames pushed by server at runtime
        std::unordered_set<std::string> m_media_pushed_files;
        // Pending downloads of dynamic media (key: token)
-       std::vector<std::pair<u32, std::unique_ptr<SingleMediaDownloader>>> m_pending_media_downloads;
+       std::vector<std::pair<u32, std::shared_ptr<SingleMediaDownloader>>> m_pending_media_downloads;
 
        // time_of_day speed approximation for old protocol
        bool m_time_of_day_set = false;

diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index d20a80fb7a1d85fa804f0f452bdb77c07cf117c2..6aececa7f7e9ea78a9465bea0aa846b00648c82d 100644 (file)
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -43,6 +43,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "tileanimation.h"
 #include "gettext.h"
 #include "skyparams.h"
+#include <memory>
 
 void Client::handleCommand_Deprecated(NetworkPacket* pkt)
 {
@@ -1559,7 +1560,7 @@ void Client::handleCommand_MediaPush(NetworkPacket *pkt)
        m_media_pushed_files.insert(filename);
 
        // create a downloader for this file
-       auto downloader = new SingleMediaDownloader(cached);
+       auto downloader(std::make_shared<SingleMediaDownloader>(cached));
        m_pending_media_downloads.emplace_back(token, downloader);
        downloader->addFile(filename, raw_hash);
        for (const auto &baseurl : m_remote_media_servers)

diff --git a/src/util/png.cpp b/src/util/png.cpp
index 7ac2e94a110544706a7d76b54fda1329acfae896..698cbc9a56d02754926e2c8f13e0ec35d55e0e6b 100755 (executable)
--- a/src/util/png.cpp
+++ b/src/util/png.cpp
@@ -37,11 +37,11 @@ static void writeChunk(std::ostringstream &target, const std::string &chunk_str)
 
 std::string encodePNG(const u8 *data, u32 width, u32 height, s32 compression)
 {
-       auto file = std::ostringstream(std::ios::binary);
+       std::ostringstream file(std::ios::binary);
        file << "\x89PNG\r\n\x1a\n";
 
        {
-               auto IHDR = std::ostringstream(std::ios::binary);
+               std::ostringstream IHDR(std::ios::binary);
                IHDR << "IHDR";
                writeU32(IHDR, width);
                writeU32(IHDR, height);
@@ -51,9 +51,9 @@ std::string encodePNG(const u8 *data, u32 width, u32 height, s32 compression)
        }
 
        {
-               auto IDAT = std::ostringstream(std::ios::binary);
+               std::ostringstream IDAT(std::ios::binary);
                IDAT << "IDAT";
-               auto scanlines = std::ostringstream(std::ios::binary);
+               std::ostringstream scanlines(std::ios::binary);
                for(u32 i = 0; i < height; i++) {
                        scanlines.write("\x00", 1); // Null predictor
                        scanlines.write((const char*) data + width * 4 * i, width * 4);