[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2013-g805ee17 |
|
Date: |
Tue, 20 May 2014 00:21:04 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 805ee179923fe212710567af7dbac16a7be6890a (commit)
via 83d36b8c3ac2e1df4abf3c380e115f3a688f5937 (commit)
from aa6ff9f4446d44da7a61c5f90bf9e08fdcf17250 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=805ee179923fe212710567af7dbac16a7be6890a
commit 805ee179923fe212710567af7dbac16a7be6890a
Author: Bastiaan Jacques <address@hidden>
Date: Tue May 20 02:18:56 2014 +0200
Replace ScopedPtr<T> with unique_ptr<T, Deleter>.
diff --git a/libbase/GnashScopedPtr.h b/libbase/GnashScopedPtr.h
deleted file mode 100644
index f5fc813..0000000
--- a/libbase/GnashScopedPtr.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// GnashSmartPtr.h: scoped pointer supporting deleters.
-//
-// Copyright (C) 2013
-// Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program 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 General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#ifndef GNASH_SCOPED_PTR_H
-#define GNASH_SCOPED_PTR_H
-
-#include <boost/utility.hpp> // noncopyable
-#include <boost/function.hpp>
-
-namespace gnash {
-
-/// ScopedPtr is very similar to scoped_ptr, but includes the Deleter
-/// functionality from shared_ptr. ScopedPtr can be used to implement the RAII
-/// pattern for C APIs, which frequently have their own deallocation strategy,
-/// when shared_ptr semantics are not desirable.
-//
-/// ScopedPtr is similar to C++11's unique_ptr, but the deleter is not part of
-/// the type.
-template <typename T>
-class ScopedPtr : private boost::noncopyable
-{
-private:
- typedef boost::function<void(T* x)> DeleterT;
-public:
-
- /// Construct a ScopedPtr and provide a deleter.
- ///
- /// @ptr the pointer to exclusively manage.
- /// @deleter the deleter to call when this object goes out of scope.
- /// The expression d(ptr) must be well-formed.
- explicit ScopedPtr(T* ptr, DeleterT d)
- : _ptr(ptr),
- _deleter(d)
- {}
-
- /// Dereferences the managed pointer and returns a reference.
- T& operator*() const
- {
- return *_ptr;
- }
-
- /// Dereference the contained pointer.
- T* operator->() const
- {
- return _ptr;
- }
-
- /// Obtain the contained pointer.
- T* get() const
- {
- return _ptr;
- }
-
- ~ScopedPtr()
- {
- if (_ptr) {
- _deleter(_ptr);
- }
- }
-private:
-
- T* _ptr;
- DeleterT _deleter;
-};
-
-} // namespace gnash
-
-#endif
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index 92f168f..5e572c4 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -45,7 +45,6 @@ libgnashbase_la_SOURCES = \
GnashImageJpeg.cpp \
GnashImageJpeg.h \
GnashNumeric.h \
- GnashScopedPtr.h \
GnashSleep.h \
GnashSystemFDHeaders.h \
GnashSystemIOHeaders.h \
@@ -200,7 +199,6 @@ inst_HEADERS = \
tu_file.h \
IOChannel.h \
Socket.h \
- GnashScopedPtr.h \
GnashSystemFDHeaders.h \
GnashSystemNetHeaders.h \
GnashSystemIOHeaders.h \
diff --git a/libbase/Socket.cpp b/libbase/Socket.cpp
index b23240a..c87f823 100644
--- a/libbase/Socket.cpp
+++ b/libbase/Socket.cpp
@@ -35,7 +35,6 @@
#include "utility.h"
#include "GnashAlgorithm.h"
#include "GnashSystemNetHeaders.h"
-#include "GnashScopedPtr.h"
namespace gnash {
@@ -164,8 +163,10 @@ Socket::connect(const std::string& hostname,
boost::uint16_t port)
}
// This is used for ::connect()
- ScopedPtr<addrinfo> ans(getAddrInfo(hostname, port), freeaddrinfo);
- if (!ans.get()) {
+ std::unique_ptr<addrinfo, decltype(freeaddrinfo)*>
ans(getAddrInfo(hostname, port),
+ freeaddrinfo);
+
+ if (!ans) {
return false;
}
diff --git a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
index e6169c8..2f98d05 100644
--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
@@ -27,7 +27,6 @@
#include "FLVParser.h"
#include "SoundInfo.h"
#include "MediaParser.h" // for AudioInfo
-#include "GnashScopedPtr.h"
//#define GNASH_DEBUG_AUDIO_DECODING
@@ -478,7 +477,8 @@ AudioDecoderFfmpeg::decodeFrame(const boost::uint8_t* input,
size_t outSize = MAX_AUDIO_FRAME_SIZE;
// TODO: make this a private member, to reuse (see NetStreamFfmpeg in
0.8.3)
- ScopedPtr<boost::int16_t> output(
reinterpret_cast<boost::int16_t*>(av_malloc(outSize)), av_free );
+ std::unique_ptr<boost::int16_t, decltype(av_free)*> output(
+ reinterpret_cast<boost::int16_t*>(av_malloc(outSize)), av_free );
if (!output.get()) {
log_error(_("failed to allocate audio buffer."));
outputSize = 0;
@@ -500,7 +500,7 @@ AudioDecoderFfmpeg::decodeFrame(const boost::uint8_t* input,
av_init_packet(&pkt);
pkt.data = const_cast<uint8_t*>(input);
pkt.size = inputSize;
- ScopedPtr<AVFrame> frm ( FRAMEALLOC(), av_free );
+ std::unique_ptr<AVFrame, decltype(av_free)*> frm ( FRAMEALLOC(), av_free );
if (!frm.get()) {
log_error(_("failed to allocate frame."));
return NULL;
http://git.savannah.gnu.org/cgit//commit/?id=83d36b8c3ac2e1df4abf3c380e115f3a688f5937
commit 83d36b8c3ac2e1df4abf3c380e115f3a688f5937
Author: Bastiaan Jacques <address@hidden>
Date: Tue May 20 02:05:26 2014 +0200
Replace scoped_ptr<T> and scoped_array<T> with unique_ptr<T> and
unique_ptr<T[]> respectively.
diff --git a/cygnal/cgi-bin/echo/echo.h b/cygnal/cgi-bin/echo/echo.h
index 81d17b5..88020c3 100644
--- a/cygnal/cgi-bin/echo/echo.h
+++ b/cygnal/cgi-bin/echo/echo.h
@@ -21,7 +21,6 @@
#include <vector>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <sstream>
// gnash headers
diff --git a/cygnal/cgi-bin/echo/gateway.h b/cygnal/cgi-bin/echo/gateway.h
index c3f703e..f2f9d48 100644
--- a/cygnal/cgi-bin/echo/gateway.h
+++ b/cygnal/cgi-bin/echo/gateway.h
@@ -22,7 +22,6 @@
#include <string>
#include <vector>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <sstream>
#include "amf.h"
diff --git a/cygnal/cgi-bin/fitcDemo/fitcDemo.h
b/cygnal/cgi-bin/fitcDemo/fitcDemo.h
index c7fdb56..a0678eb 100644
--- a/cygnal/cgi-bin/fitcDemo/fitcDemo.h
+++ b/cygnal/cgi-bin/fitcDemo/fitcDemo.h
@@ -21,7 +21,6 @@
#include <vector>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <sstream>
// gnash headers
diff --git a/cygnal/cgi-bin/oflaDemo/oflaDemo.cpp
b/cygnal/cgi-bin/oflaDemo/oflaDemo.cpp
index 30e5aa4..19133e9 100644
--- a/cygnal/cgi-bin/oflaDemo/oflaDemo.cpp
+++ b/cygnal/cgi-bin/oflaDemo/oflaDemo.cpp
@@ -27,7 +27,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <ctime>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#if !defined(_MSC_VER)
# include <unistd.h>
@@ -155,7 +155,7 @@ extern "C" {
std::shared_ptr<cygnal::Buffer> head = oflaDemo.encodeHeader(0x3,
RTMP::HEADER_12, error->allocated(),
RTMP::INVOKE, RTMPMsg::FROM_SERVER);
- boost::scoped_ptr<cygnal::Buffer> response(new cygnal::Buffer(
+ std::unique_ptr<cygnal::Buffer> response(new cygnal::Buffer(
error->allocated() + head->allocated()));
*response = head;
*response += error;
diff --git a/cygnal/cgi-bin/oflaDemo/oflaDemo.h
b/cygnal/cgi-bin/oflaDemo/oflaDemo.h
index 23b12a8..31830c4 100644
--- a/cygnal/cgi-bin/oflaDemo/oflaDemo.h
+++ b/cygnal/cgi-bin/oflaDemo/oflaDemo.h
@@ -22,7 +22,6 @@
#include <string>
#include <vector>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <sstream>
// gnash headers
diff --git a/cygnal/handler.cpp b/cygnal/handler.cpp
index ae3c2af..2745658 100644
--- a/cygnal/handler.cpp
+++ b/cygnal/handler.cpp
@@ -23,7 +23,7 @@
#include <boost/thread/thread.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/shared_array.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <functional>
#include <algorithm>
#include <string>
diff --git a/cygnal/handler.h b/cygnal/handler.h
index 715ce77..8d7fb66 100644
--- a/cygnal/handler.h
+++ b/cygnal/handler.h
@@ -23,7 +23,7 @@
#include <boost/cstdint.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/shared_array.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
//#include <boost/thread/condition.hpp>
#include <vector>
diff --git a/cygnal/http_server.cpp b/cygnal/http_server.cpp
index 039678e..c35dd39 100644
--- a/cygnal/http_server.cpp
+++ b/cygnal/http_server.cpp
@@ -24,7 +24,6 @@
#include <boost/thread/mutex.hpp>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <boost/tokenizer.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/date_time/gregorian/gregorian.hpp>
diff --git a/cygnal/http_server.h b/cygnal/http_server.h
index 207cd51..2b5ebcc 100644
--- a/cygnal/http_server.h
+++ b/cygnal/http_server.h
@@ -23,7 +23,6 @@
#include <string>
#include <vector>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <sstream>
#include "amf.h"
diff --git a/cygnal/libamf/buffer.cpp b/cygnal/libamf/buffer.cpp
index a06c57b..ab1429f 100644
--- a/cygnal/libamf/buffer.cpp
+++ b/cygnal/libamf/buffer.cpp
@@ -665,7 +665,7 @@ Buffer &
Buffer::resize(size_t size)
{
// GNASH_REPORT_FUNCTION;
- boost::scoped_array<boost::uint8_t> tmp;
+ std::unique_ptr<boost::uint8_t[]> tmp;
// If there is no size, don't do anything
if (size == 0) {
diff --git a/cygnal/libamf/buffer.h b/cygnal/libamf/buffer.h
index e35dd77..cd9078b 100644
--- a/cygnal/libamf/buffer.h
+++ b/cygnal/libamf/buffer.h
@@ -25,7 +25,6 @@
#include <vector>
#include <boost/cstdint.hpp>
-#include <boost/scoped_array.hpp>
#include <iostream> // for output operator
#include <string>
@@ -405,7 +404,7 @@ public:
/// \var _data
/// \brief This is the container of the actual data in this
/// Buffer.
- boost::scoped_array<boost::uint8_t> _data;
+ std::unique_ptr<boost::uint8_t[]> _data;
/// \var _nbytes
/// \brief This is the total allocated size of the Buffer.
diff --git a/cygnal/libamf/element.h b/cygnal/libamf/element.h
index 382d9bd..e992936 100644
--- a/cygnal/libamf/element.h
+++ b/cygnal/libamf/element.h
@@ -24,7 +24,7 @@
#include <cstring>
#include <iostream> // for output operator
#include <boost/cstdint.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
//#include "network.h"
#include "dsodefs.h" // DSOEXPORT
diff --git a/cygnal/libamf/sol.cpp b/cygnal/libamf/sol.cpp
index 3a53130..6929a47 100644
--- a/cygnal/libamf/sol.cpp
+++ b/cygnal/libamf/sol.cpp
@@ -25,7 +25,6 @@
#include "log.h"
#include "GnashException.h"
-#include <boost/scoped_array.hpp>
#include <boost/cstdint.hpp>
#include <cerrno>
#include <string>
@@ -248,7 +247,7 @@ SOL::writeFile(const std::string &filespec, const
std::string &name)
}
_filesize = size;
- boost::scoped_array<char> body ( new char[size + 20] );
+ std::unique_ptr<char[]> body ( new char[size + 20] );
std::fill_n(body.get(), size, 0);
ptr = body.get();
char* endPtr = ptr+size+20; // that's the amount we allocated..
@@ -305,7 +304,7 @@ SOL::writeFile(const std::string &filespec, const
std::string &name)
_filesize = ptr - body.get();
int len = name.size() + sizeof(boost::uint16_t) + 16;
- boost::scoped_array<char> head ( new char[len + 4] );
+ std::unique_ptr<char[]> head ( new char[len + 4] );
memset(head.get(), 0, len);
ptr = head.get();
formatHeader(name);
@@ -354,7 +353,7 @@ SOL::readFile(const std::string &filespec)
std::ifstream ifs(filespec.c_str(), std::ios::binary);
_filesize = st.st_size;
- boost::scoped_array<boost::uint8_t> buf(
+ std::unique_ptr<boost::uint8_t[]> buf(
new boost::uint8_t[_filesize + sizeof(int)]);
ptr = buf.get();
diff --git a/cygnal/libnet/cache.cpp b/cygnal/libnet/cache.cpp
index 97f5bda..307be35 100644
--- a/cygnal/libnet/cache.cpp
+++ b/cygnal/libnet/cache.cpp
@@ -24,7 +24,6 @@
#include <boost/thread/mutex.hpp>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <sys/types.h>
#include <sys/stat.h>
#include <string>
diff --git a/cygnal/libnet/diskstream.h b/cygnal/libnet/diskstream.h
index 7beb821..4b7d0c3 100644
--- a/cygnal/libnet/diskstream.h
+++ b/cygnal/libnet/diskstream.h
@@ -34,7 +34,7 @@
#include "statistics.h"
#include "getclocktime.hpp"
#include "dsodefs.h"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
/// \namespace gnash
/// This is the main namespace for Gnash and it's libraries.
diff --git a/cygnal/libnet/http.cpp b/cygnal/libnet/http.cpp
index 357a64c..22d9b77 100644
--- a/cygnal/libnet/http.cpp
+++ b/cygnal/libnet/http.cpp
@@ -20,7 +20,6 @@
#include <boost/thread/mutex.hpp>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <boost/tokenizer.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/date_time/gregorian/gregorian.hpp>
diff --git a/cygnal/libnet/http.h b/cygnal/libnet/http.h
index 479e174..ebe32f6 100644
--- a/cygnal/libnet/http.h
+++ b/cygnal/libnet/http.h
@@ -24,7 +24,6 @@
#include <map>
#include <vector>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <sstream>
#ifdef HAVE_CONFIG_H
diff --git a/cygnal/libnet/network.h b/cygnal/libnet/network.h
index 7c7f983..c495e85 100644
--- a/cygnal/libnet/network.h
+++ b/cygnal/libnet/network.h
@@ -45,7 +45,7 @@
# include <io.h>
#endif
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <boost/cstdint.hpp>
#include <boost/thread/mutex.hpp>
#include <vector>
@@ -355,10 +355,10 @@ public:
boost::mutex _poll_mutex;
boost::mutex _net_mutex;
#ifdef USE_SSL
- boost::scoped_ptr<SSLClient> _ssl;
+ std::unique_ptr<SSLClient> _ssl;
#endif
#ifdef USE_SSH
- boost::scoped_ptr<SSHClient> _ssh;
+ std::unique_ptr<SSHClient> _ssh;
#endif
};
diff --git a/cygnal/libnet/rtmp.h b/cygnal/libnet/rtmp.h
index a0ea12f..038eafc 100644
--- a/cygnal/libnet/rtmp.h
+++ b/cygnal/libnet/rtmp.h
@@ -21,7 +21,7 @@
#include <deque>
#include <boost/cstdint.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <boost/lexical_cast.hpp>
#include <string>
#include <vector>
diff --git a/cygnal/libnet/rtmp_client.cpp b/cygnal/libnet/rtmp_client.cpp
index f2e1b5a..f4d9d01 100644
--- a/cygnal/libnet/rtmp_client.cpp
+++ b/cygnal/libnet/rtmp_client.cpp
@@ -285,7 +285,7 @@ RTMPClient::connectToServer(const std::string &url)
// always one by, so we just add it by hand. It doesn't matter
// as long as the channel number matches the one used to
// create the initial RTMP packet header.
- boost::scoped_ptr<cygnal::Buffer> newbuf(new
cygnal::Buffer(ncbuf->size() + 5));
+ std::unique_ptr<cygnal::Buffer> newbuf(new cygnal::Buffer(ncbuf->size()
+ 5));
size_t nbytes = 0;
size_t chunk = RTMP_VIDEO_PACKET_SIZE;
do {
@@ -313,7 +313,7 @@ RTMPClient::connectToServer(const std::string &url)
return false;
}
- boost::scoped_ptr<cygnal::Buffer> handshake2(new cygnal::Buffer
+ std::unique_ptr<cygnal::Buffer> handshake2(new cygnal::Buffer
((RTMP_HANDSHAKE_SIZE * 2) + newbuf->allocated()
+ RTMP_MAX_HEADER_SIZE));
diff --git a/cygnal/libnet/sshclient.cpp b/cygnal/libnet/sshclient.cpp
index e524a30..be04c9e 100644
--- a/cygnal/libnet/sshclient.cpp
+++ b/cygnal/libnet/sshclient.cpp
@@ -19,7 +19,6 @@
#include <boost/thread/mutex.hpp>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <boost/cstdint.hpp>
#include <boost/array.hpp>
#include <sys/types.h>
diff --git a/cygnal/libnet/sshclient.h b/cygnal/libnet/sshclient.h
index 46f51cc..4765e68 100644
--- a/cygnal/libnet/sshclient.h
+++ b/cygnal/libnet/sshclient.h
@@ -22,7 +22,6 @@
#include <string>
#include <boost/array.hpp>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <boost/cstdint.hpp>
#include <sstream>
diff --git a/cygnal/libnet/sshserver.cpp b/cygnal/libnet/sshserver.cpp
index 5b15a85..2ee0ef1 100644
--- a/cygnal/libnet/sshserver.cpp
+++ b/cygnal/libnet/sshserver.cpp
@@ -19,7 +19,6 @@
#include <boost/thread/mutex.hpp>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <boost/cstdint.hpp>
#include <boost/array.hpp>
#include <sys/types.h>
diff --git a/cygnal/libnet/sshserver.h b/cygnal/libnet/sshserver.h
index 7664483..7955e06 100644
--- a/cygnal/libnet/sshserver.h
+++ b/cygnal/libnet/sshserver.h
@@ -22,7 +22,6 @@
#include <string>
#include <boost/array.hpp>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <boost/cstdint.hpp>
#include <sstream>
diff --git a/cygnal/libnet/sslclient.cpp b/cygnal/libnet/sslclient.cpp
index 5a7cca4..cec097b 100644
--- a/cygnal/libnet/sslclient.cpp
+++ b/cygnal/libnet/sslclient.cpp
@@ -23,7 +23,6 @@
#include <boost/thread/mutex.hpp>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <boost/cstdint.hpp>
#include <boost/array.hpp>
#include <sys/types.h>
diff --git a/cygnal/libnet/sslclient.h b/cygnal/libnet/sslclient.h
index 4de1a22..55029f9 100644
--- a/cygnal/libnet/sslclient.h
+++ b/cygnal/libnet/sslclient.h
@@ -26,7 +26,6 @@
#include <string>
#include <boost/array.hpp>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <boost/cstdint.hpp>
#include <sstream>
@@ -108,10 +107,10 @@ public:
void dump();
protected:
- boost::scoped_ptr<SSL> _ssl;
- boost::scoped_ptr<SSL_CTX> _ctx;
- boost::scoped_ptr<BIO> _bio;
- boost::scoped_ptr<BIO> _bio_error;
+ std::unique_ptr<SSL> _ssl;
+ std::unique_ptr<SSL_CTX> _ctx;
+ std::unique_ptr<BIO> _bio;
+ std::unique_ptr<BIO> _bio_error;
std::string _hostname;
std::string _calist;
std::string _keyfile;
diff --git a/cygnal/libnet/sslserver.cpp b/cygnal/libnet/sslserver.cpp
index 0118eb0..05bd69f 100644
--- a/cygnal/libnet/sslserver.cpp
+++ b/cygnal/libnet/sslserver.cpp
@@ -23,7 +23,6 @@
#include <boost/thread/mutex.hpp>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <boost/cstdint.hpp>
#include <boost/array.hpp>
#include <sys/types.h>
diff --git a/cygnal/libnet/sslserver.h b/cygnal/libnet/sslserver.h
index e0455db..b5cd371 100644
--- a/cygnal/libnet/sslserver.h
+++ b/cygnal/libnet/sslserver.h
@@ -25,7 +25,6 @@
#include <boost/array.hpp>
#include <boost/shared_array.hpp>
-#include <boost/scoped_array.hpp>
#include <boost/cstdint.hpp>
#include <sstream>
diff --git a/cygnal/rtmp_server.cpp b/cygnal/rtmp_server.cpp
index 81efd19..4bf5719 100644
--- a/cygnal/rtmp_server.cpp
+++ b/cygnal/rtmp_server.cpp
@@ -107,7 +107,7 @@ RTMPServer::processClientHandShake(int fd)
// These store the information we need from the initial
/// NetConnection object.
- boost::scoped_ptr<cygnal::Element> nc;
+ std::unique_ptr<cygnal::Element> nc;
std::shared_ptr<cygnal::Buffer> pkt;
std::shared_ptr<cygnal::Element> tcurl;
std::shared_ptr<cygnal::Element> swfurl;
@@ -179,7 +179,7 @@ RTMPServer::processClientHandShake(int fd)
// now build a copy of the data but skip over the RTMP header
// bytes every chunk size biundary. All RTMP headers at this stage
// are 1 byte ones.
- boost::scoped_ptr<cygnal::Buffer> newptr(new
cygnal::Buffer(qhead->bodysize));
+ std::unique_ptr<cygnal::Buffer> newptr(new
cygnal::Buffer(qhead->bodysize));
if (qhead->bodysize > RTMP_VIDEO_PACKET_SIZE) {
log_network("De chunkifying the NetConnection packet.");
int nbytes = 0;
@@ -293,7 +293,7 @@ RTMPServer::handShakeResponse(int fd, cygnal::Buffer
&handshake)
// the response handshake is twice the size of the one we just
// received for a total of 3072 bytes, plus room for the version.
- boost::scoped_ptr<cygnal::Buffer> zeros(new
cygnal::Buffer(RTMP_HANDSHAKE_SIZE*2
+ std::unique_ptr<cygnal::Buffer> zeros(new
cygnal::Buffer(RTMP_HANDSHAKE_SIZE*2
+ RTMP_HANDSHAKE_VERSION_SIZE));
zeros->clear(); // set entire buffer to zeros
diff --git a/gui/dump/dump.cpp b/gui/dump/dump.cpp
index ca7a607..638ed48 100644
--- a/gui/dump/dump.cpp
+++ b/gui/dump/dump.cpp
@@ -82,7 +82,6 @@ DumpGui::DumpGui(unsigned long xid, float scale, bool loop,
RunResources& r)
:
Gui(xid, scale, loop, r),
_agg_renderer(0),
- _offscreenbuf(NULL),
_offscreenbuf_size(-1),
_timeout(0),
_framecount(0),
diff --git a/gui/dump/dump.h b/gui/dump/dump.h
index 6a55043..5f49bb1 100644
--- a/gui/dump/dump.h
+++ b/gui/dump/dump.h
@@ -29,7 +29,6 @@
#include <string>
#include <fstream>
-#include <boost/scoped_array.hpp>
namespace gnash {
namespace sound {
@@ -84,7 +83,7 @@ private:
// is destroyed on reset and when it goes out of scope (including on
// stack unwinding after an exception), so there is no need to delete
// it.
- boost::scoped_array<unsigned char> _offscreenbuf;
+ std::unique_ptr<unsigned char[]> _offscreenbuf;
int _offscreenbuf_size; /* size of window (bytes) */
diff --git a/gui/fb/fb_glue.h b/gui/fb/fb_glue.h
index fd38de0..f387361 100644
--- a/gui/fb/fb_glue.h
+++ b/gui/fb/fb_glue.h
@@ -76,7 +76,7 @@ public:
virtual void beforeRendering(movie_root *) {};
protected:
- boost::scoped_ptr<Renderer> _renderer;
+ std::unique_ptr<Renderer> _renderer;
};
} // end of namespace gui
diff --git a/gui/fb/fb_glue_agg.h b/gui/fb/fb_glue_agg.h
index 78e4522..e581721 100644
--- a/gui/fb/fb_glue_agg.h
+++ b/gui/fb/fb_glue_agg.h
@@ -104,7 +104,7 @@ protected:
struct fb_fix_screeninfo _fixinfo;
struct fb_var_screeninfo _varinfo;
- boost::scoped_ptr<Renderer> _renderer;
+ std::unique_ptr<Renderer> _renderer;
geometry::Range2d<int> _validbounds;
std::vector< geometry::Range2d<int> > _drawbounds;
diff --git a/gui/fb/fb_glue_gles1.h b/gui/fb/fb_glue_gles1.h
index b7e7daa..ca80682 100644
--- a/gui/fb/fb_glue_gles1.h
+++ b/gui/fb/fb_glue_gles1.h
@@ -50,7 +50,7 @@
# include "egl/eglDevice.h"
#endif
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "fbsup.h"
@@ -89,7 +89,7 @@ protected:
int _fd;
private:
- boost::scoped_ptr<Renderer> _renderer;
+ std::unique_ptr<Renderer> _renderer;
EGLDisplay _display;
EGLConfig _config;
EGLContext _context;
diff --git a/gui/fb/fbsup.h b/gui/fb/fbsup.h
index 0a0085f..5ba8959 100644
--- a/gui/fb/fbsup.h
+++ b/gui/fb/fbsup.h
@@ -23,7 +23,6 @@
#include "gnashconfig.h"
#endif
-#include <boost/scoped_array.hpp>
#include <boost/cstdint.hpp>
#include <vector>
diff --git a/gui/gtk/gtk_glue_agg.h b/gui/gtk/gtk_glue_agg.h
index fd86558..9b14000 100644
--- a/gui/gtk/gtk_glue_agg.h
+++ b/gui/gtk/gtk_glue_agg.h
@@ -25,7 +25,6 @@
#include <gtk/gtk.h>
#include <gdk/gdk.h>
-#include <boost/scoped_array.hpp>
namespace gnash
{
diff --git a/gui/gtk/gtk_glue_agg_vaapi.h b/gui/gtk/gtk_glue_agg_vaapi.h
index d162041..c77e040 100644
--- a/gui/gtk/gtk_glue_agg_vaapi.h
+++ b/gui/gtk/gtk_glue_agg_vaapi.h
@@ -25,7 +25,6 @@
#include <gtk/gtk.h>
#include <gdk/gdk.h>
-#include <boost/scoped_array.hpp>
#include <memory>
#include "vaapi/VaapiImageFormat.h"
diff --git a/gui/gtk/gtk_glue_gtkglext.h b/gui/gtk/gtk_glue_gtkglext.h
index cb65726..3a41131 100644
--- a/gui/gtk/gtk_glue_gtkglext.h
+++ b/gui/gtk/gtk_glue_gtkglext.h
@@ -25,7 +25,6 @@
#include <gtk/gtk.h>
#include <gdk/gdk.h>
-#include <boost/scoped_array.hpp>
#include <gtk/gtkgl.h>
diff --git a/gui/gtk/gtk_glue_ovg.h b/gui/gtk/gtk_glue_ovg.h
index 67cfcb2..08f7aba 100644
--- a/gui/gtk/gtk_glue_ovg.h
+++ b/gui/gtk/gtk_glue_ovg.h
@@ -25,8 +25,7 @@
#include <gtk/gtk.h>
#include <gdk/gdk.h>
-#include <boost/scoped_array.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "openvg/OpenVGRenderer.h"
#ifdef HAVE_VG_OPENVG_H
diff --git a/gui/gui.h b/gui/gui.h
index 3e08819..dc23ef1 100644
--- a/gui/gui.h
+++ b/gui/gui.h
@@ -24,7 +24,7 @@
#endif
#include <boost/intrusive_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <string>
#include <map>
#include <utility>
@@ -602,7 +602,7 @@ private:
InterruptableVirtualClock _virtualClock;
/// Checked on each advance for screenshot activity if it exists.
- boost::scoped_ptr<ScreenShotter> _screenShotter;
+ std::unique_ptr<ScreenShotter> _screenShotter;
#ifdef ENABLE_KEYBOARD_MOUSE_MOVEMENTS
int _xpointer;
diff --git a/gui/qt/Qt4GlueAgg.h b/gui/qt/Qt4GlueAgg.h
index 52b7ae5..92832bf 100644
--- a/gui/qt/Qt4GlueAgg.h
+++ b/gui/qt/Qt4GlueAgg.h
@@ -28,7 +28,6 @@
#include <memory>
#include <QImage>
-#include <boost/scoped_array.hpp>
#include <QPainter>
#include "snappingrange.h"
@@ -54,7 +53,7 @@ class Qt4AggGlue : public Qt4Glue
private:
int _width;
int _height;
- boost::scoped_array<unsigned char> _offscreenbuf;
+ std::unique_ptr<unsigned char[]> _offscreenbuf;
Renderer* _renderer; // We don't own this pointer.
std::unique_ptr<QImage> _image;
std::unique_ptr<QPainter> _painter;
diff --git a/gui/qt/Qt4GlueCairo.h b/gui/qt/Qt4GlueCairo.h
index 02cc448..4121b98 100644
--- a/gui/qt/Qt4GlueCairo.h
+++ b/gui/qt/Qt4GlueCairo.h
@@ -28,7 +28,6 @@
#include <memory> // for unique_ptr
#include <QImage>
-#include <boost/scoped_array.hpp>
#include <QPainter>
#include "snappingrange.h"
@@ -56,7 +55,7 @@ class Qt4CairoGlue : public Qt4Glue
private:
int _width;
int _height;
- boost::scoped_array<unsigned char> _offscreenbuf;
+ std::unique_ptr<unsigned char[]> _offscreenbuf;
Renderer* _renderer; // We don't own this pointer.
std::unique_ptr<QImage> _image;
std::unique_ptr<QPainter> _painter;
diff --git a/gui/qt/Qt4GlueOgl.h b/gui/qt/Qt4GlueOgl.h
index 2e7c1f6..39e145e 100644
--- a/gui/qt/Qt4GlueOgl.h
+++ b/gui/qt/Qt4GlueOgl.h
@@ -26,7 +26,6 @@
#include "Qt4Glue.h"
-#include <boost/scoped_array.hpp>
#include "snappingrange.h"
class QRect;
diff --git a/gui/qt/kde_glue_agg.h b/gui/qt/kde_glue_agg.h
index 9b6102a..65727ce 100644
--- a/gui/qt/kde_glue_agg.h
+++ b/gui/qt/kde_glue_agg.h
@@ -29,7 +29,6 @@
#include "kde_glue.h"
#include <vector>
#include <memory>
-#include <boost/scoped_array.hpp>
namespace gnash
@@ -52,7 +51,7 @@ class KdeAggGlue : public KdeGlue
private:
int _width;
int _height;
- boost::scoped_array<unsigned char> _offscreenbuf;
+ std::unique_ptr<unsigned char[]> _offscreenbuf;
Renderer* _renderer; // We don't own this pointer.
geometry::Range2d<int> _validbounds;
std::vector< geometry::Range2d<int> > _drawbounds;
diff --git a/libbase/GnashImage.cpp b/libbase/GnashImage.cpp
index 1585047..f181796 100644
--- a/libbase/GnashImage.cpp
+++ b/libbase/GnashImage.cpp
@@ -23,7 +23,6 @@
#include "GnashImage.h"
#include <memory>
-#include <boost/scoped_array.hpp>
#include <algorithm>
#include <cassert>
@@ -306,7 +305,7 @@ Input::readSWFJpeg3(std::shared_ptr<IOChannel> in)
j_in->readScanline(scanline(*im, y));
}
} else {
- boost::scoped_array<GnashImage::value_type> line(
+ std::unique_ptr<GnashImage::value_type[]> line(
new GnashImage::value_type[3 * width]);
for (size_t y = 0; y < height; ++y) {
diff --git a/libbase/GnashImage.h b/libbase/GnashImage.h
index 106306d..5652855 100644
--- a/libbase/GnashImage.h
+++ b/libbase/GnashImage.h
@@ -26,7 +26,6 @@
#include <boost/noncopyable.hpp>
#include <boost/cstdint.hpp>
-#include <boost/scoped_array.hpp>
#include <memory>
#include "GnashEnums.h"
@@ -80,7 +79,7 @@ class DSOEXPORT GnashImage : boost::noncopyable
public:
typedef boost::uint8_t value_type;
- typedef boost::scoped_array<value_type> container_type;
+ typedef std::unique_ptr<value_type[]> container_type;
typedef value_type* iterator;
typedef const value_type* const_iterator;
diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
index 7b7aa90..90801c7 100644
--- a/libbase/GnashImageGif.cpp
+++ b/libbase/GnashImageGif.cpp
@@ -22,7 +22,6 @@
#include <sstream>
#include <algorithm>
-#include <boost/scoped_array.hpp>
extern "C" {
#include <gif_lib.h>
@@ -103,10 +102,10 @@ private:
// A counter for keeping track of the last row copied.
size_t _currentRow;
- typedef boost::scoped_array<GifPixelType> PixelRow;
+ typedef std::unique_ptr<GifPixelType[]> PixelRow;
// A 2-dimensional scoped array holding the unpacked pixel data.
- boost::scoped_array<PixelRow> _gifData;
+ std::unique_ptr<PixelRow[]> _gifData;
};
diff --git a/libbase/GnashImageJpeg.cpp b/libbase/GnashImageJpeg.cpp
index e800307..25ad0e3 100644
--- a/libbase/GnashImageJpeg.cpp
+++ b/libbase/GnashImageJpeg.cpp
@@ -608,7 +608,7 @@ JpegOutput::writeImageRGBA(const unsigned char* rgbaData)
const size_t components = 3;
const size_t size = _width * _height;
- boost::scoped_array<unsigned char> data(
+ std::unique_ptr<unsigned char[]> data(
new unsigned char[size * components]);
for (size_t pixel = 0; pixel < size; ++pixel) {
diff --git a/libbase/GnashImagePng.cpp b/libbase/GnashImagePng.cpp
index 837ae2d..3c388e6 100644
--- a/libbase/GnashImagePng.cpp
+++ b/libbase/GnashImagePng.cpp
@@ -25,7 +25,6 @@
#include "GnashImagePng.h"
#include <sstream>
-#include <boost/scoped_array.hpp>
extern "C" {
#ifdef HAVE_PNG_H
@@ -96,8 +95,6 @@ public:
Input(in),
_pngPtr(0),
_infoPtr(0),
- _rowPtrs(0),
- _pixelData(0),
_currentRow(0)
{
init();
@@ -130,8 +127,8 @@ private:
// State needed for input.
png_structp _pngPtr;
png_infop _infoPtr;
- boost::scoped_array<png_bytep> _rowPtrs;
- boost::scoped_array<png_byte> _pixelData;
+ std::unique_ptr<png_bytep[]> _rowPtrs;
+ std::unique_ptr<png_byte[]> _pixelData;
// A counter for keeping track of the last row copied.
size_t _currentRow;
@@ -356,7 +353,7 @@ PngOutput::writeImageRGBA(const unsigned char* rgbaData)
{
png_set_write_fn(_pngPtr, _outStream.get(), &writeData, &flushData);
- boost::scoped_array<const png_byte*> rows(new const png_byte*[_height]);
+ std::unique_ptr<const png_byte*[]> rows(new const png_byte*[_height]);
// RGBA
const size_t components = 4;
@@ -381,7 +378,7 @@ PngOutput::writeImageRGB(const unsigned char* rgbData)
{
png_set_write_fn(_pngPtr, _outStream.get(), &writeData, &flushData);
- boost::scoped_array<const png_byte*> rows(new const png_byte*[_height]);
+ std::unique_ptr<const png_byte*[]> rows(new const png_byte*[_height]);
// RGB
const size_t components = 3;
diff --git a/libbase/RTMP.h b/libbase/RTMP.h
index 62447c0..87f4692 100644
--- a/libbase/RTMP.h
+++ b/libbase/RTMP.h
@@ -20,7 +20,7 @@
#define GNASH_RTMP_H
#include <boost/cstdint.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <deque>
#include <map>
@@ -524,7 +524,7 @@ private:
/// Chunk size for sending.
size_t _outChunkSize;
- boost::scoped_ptr<HandShaker> _handShaker;
+ std::unique_ptr<HandShaker> _handShaker;
bool _connected;
@@ -534,7 +534,7 @@ private:
//
/// This is not the same as a non-ready packet. It applies only to packets
/// waiting for payload data.
- boost::scoped_ptr<RTMPPacket> _incompletePacket;
+ std::unique_ptr<RTMPPacket> _incompletePacket;
};
diff --git a/libbase/SimpleBuffer.h b/libbase/SimpleBuffer.h
index 290382d..9f51d34 100644
--- a/libbase/SimpleBuffer.h
+++ b/libbase/SimpleBuffer.h
@@ -22,7 +22,7 @@
#include <boost/cstdint.hpp> // for boost::uint8_t
#include <algorithm> // for std::copy
-#include <boost/scoped_array.hpp>
+#include <memory>
#include <cassert>
@@ -119,7 +119,7 @@ public:
// TODO: use smalles power of 2 bigger then newCapacity
_capacity = std::max(newCapacity, _capacity*2);
- boost::scoped_array<boost::uint8_t> tmp;
+ std::unique_ptr<boost::uint8_t[]> tmp;
tmp.swap(_data);
_data.reset(new boost::uint8_t[_capacity]);
@@ -215,7 +215,7 @@ private:
size_t _size;
size_t _capacity;
- boost::scoped_array<boost::uint8_t> _data;
+ std::unique_ptr<boost::uint8_t[]> _data;
};
diff --git a/libbase/URL.cpp b/libbase/URL.cpp
index 9455215..0751218 100644
--- a/libbase/URL.cpp
+++ b/libbase/URL.cpp
@@ -28,7 +28,6 @@
#include <algorithm>
#include <cerrno>
#include <boost/tokenizer.hpp>
-#include <boost/scoped_array.hpp>
#include <cctype>
// This is for getcwd(2)
@@ -155,7 +154,7 @@ URL::URL(const std::string& absolute_url)
// When does it get silly?
const size_t maxSize = 4096;
- boost::scoped_array<char> buf;
+ std::unique_ptr<char[]> buf;
char* dir = 0;
size_t bufSize = 0;
diff --git a/libbase/noseek_fd_adapter.cpp b/libbase/noseek_fd_adapter.cpp
index 7036b1b..4280ec7 100644
--- a/libbase/noseek_fd_adapter.cpp
+++ b/libbase/noseek_fd_adapter.cpp
@@ -18,7 +18,6 @@
#include "noseek_fd_adapter.h"
-#include <boost/scoped_array.hpp>
#include <cerrno>
#include <cstdio>
#include <string>
diff --git a/libcore/ExternalInterface.cpp b/libcore/ExternalInterface.cpp
index 41de828..a481197 100644
--- a/libcore/ExternalInterface.cpp
+++ b/libcore/ExternalInterface.cpp
@@ -24,7 +24,6 @@
#include <vector>
#include <sstream>
#include <boost/algorithm/string/erase.hpp>
-#include <boost/scoped_array.hpp>
#include <algorithm>
#ifdef SOLARIS_HOST
@@ -153,7 +152,7 @@ ExternalInterface::ExternalEventCheck(int fd)
return error;
}
log_debug("There are %d bytes in the network buffer", bytes);
- boost::scoped_array<char> buffer(new char[bytes + 1]);
+ std::unique_ptr<char[]> buffer(new char[bytes + 1]);
// Since we know how bytes are in the network buffer, allocate
// some memory to read the data.
// terminate incase we want to treat the data like a string.
diff --git a/libcore/Font.cpp b/libcore/Font.cpp
index 7d563b2..f92b223 100644
--- a/libcore/Font.cpp
+++ b/libcore/Font.cpp
@@ -90,7 +90,6 @@ Font::Font(std::unique_ptr<SWF::DefineFontTag> ft)
Font::Font(const std::string& name, bool bold, bool italic)
:
- _fontTag(0),
_name(name),
_unicodeChars(false),
_shiftJISChars(false),
diff --git a/libcore/Font.h b/libcore/Font.h
index 443d8d2..fa1afe4 100644
--- a/libcore/Font.h
+++ b/libcore/Font.h
@@ -25,7 +25,7 @@
#define GNASH_FONT_H
#include <string>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <boost/cstdint.hpp>
#include <memory>
#include <vector>
@@ -287,7 +287,7 @@ private:
int add_os_glyph(boost::uint16_t code);
/// If we were constructed from a definition, this is not NULL.
- boost::scoped_ptr<SWF::DefineFontTag> _fontTag;
+ std::unique_ptr<SWF::DefineFontTag> _fontTag;
// Device glyphs
GlyphInfoRecords _deviceGlyphTable;
diff --git a/libcore/LoadVariablesThread.cpp b/libcore/LoadVariablesThread.cpp
index 4229168..346d8a2 100644
--- a/libcore/LoadVariablesThread.cpp
+++ b/libcore/LoadVariablesThread.cpp
@@ -25,7 +25,6 @@
#include "StreamProvider.h"
#include <string>
-#include <boost/scoped_array.hpp>
//#define DEBUG_LOAD_VARIABLES 1
@@ -49,7 +48,7 @@ LoadVariablesThread::completeLoad()
std::string toparse;
const size_t chunkSize = 1024;
- boost::scoped_array<char> buf(new char[chunkSize]);
+ std::unique_ptr<char[]> buf(new char[chunkSize]);
unsigned int parsedLines = 0;
// TODO: use read_string ?
while ( size_t bytesRead = _stream->read(buf.get(), chunkSize) )
diff --git a/libcore/abc/AbcBlock.h b/libcore/abc/AbcBlock.h
index b75c422..eba2c84 100644
--- a/libcore/abc/AbcBlock.h
+++ b/libcore/abc/AbcBlock.h
@@ -29,7 +29,6 @@
#include <vector>
#include <string>
-#include <boost/scoped_array.hpp>
#include <stdexcept>
namespace gnash {
diff --git a/libcore/as_object.cpp b/libcore/as_object.cpp
index 0147b9a..eb4ef0e 100644
--- a/libcore/as_object.cpp
+++ b/libcore/as_object.cpp
@@ -282,7 +282,6 @@ as_object::as_object(const Global_as& gl)
GcResource(getRoot(gl).gc()),
_displayObject(0),
_array(false),
- _relay(0),
_vm(getVM(gl)),
_members(*this)
{
@@ -293,7 +292,6 @@ as_object::as_object(VM& vm)
GcResource(vm.getRoot().gc()),
_displayObject(0),
_array(false),
- _relay(0),
_vm(vm),
_members(*this)
{
diff --git a/libcore/as_object.h b/libcore/as_object.h
index 639b49b..a18fb45 100644
--- a/libcore/as_object.h
+++ b/libcore/as_object.h
@@ -27,7 +27,7 @@
#include <vector>
#include <cmath>
#include <utility>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <boost/noncopyable.hpp>
#include "GC.h" // for inheritance from GcResource (to complete)
@@ -707,7 +707,7 @@ private:
//
/// This is owned by the as_object and destroyed when the as_object's
/// destructor is called.
- boost::scoped_ptr<Relay> _relay;
+ std::unique_ptr<Relay> _relay;
/// The VM containing this object.
VM& _vm;
@@ -722,7 +722,7 @@ private:
std::vector<as_object*> _interfaces;
typedef std::map<ObjectURI, Trigger, ObjectURI::LessThan> TriggerContainer;
- boost::scoped_ptr<TriggerContainer> _trigs;
+ std::unique_ptr<TriggerContainer> _trigs;
};
/// Send a system event
diff --git a/libcore/asobj/Camera_as.cpp b/libcore/asobj/Camera_as.cpp
index dedc62e..485b9d5 100644
--- a/libcore/asobj/Camera_as.cpp
+++ b/libcore/asobj/Camera_as.cpp
@@ -20,7 +20,7 @@
#include "Camera_as.h"
#include <sstream>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <memory>
#include "as_object.h" // for inheritance
@@ -229,7 +229,7 @@ public:
private:
- boost::scoped_ptr<media::VideoInput> _input;
+ std::unique_ptr<media::VideoInput> _input;
// TODO: see whether this should be handled in the VideoInput class
bool _loopback;
diff --git a/libcore/asobj/Global_as.h b/libcore/asobj/Global_as.h
index e8cae06..89b1ff3 100644
--- a/libcore/asobj/Global_as.h
+++ b/libcore/asobj/Global_as.h
@@ -27,7 +27,7 @@
#include <boost/preprocessor/repetition/repeat_from_to.hpp>
#include <boost/preprocessor/seq/for_each.hpp>
#include <boost/preprocessor/facilities/empty.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "as_object.h"
#include "fn_call.h"
@@ -89,7 +89,7 @@ protected:
private:
void loadExtensions();
- boost::scoped_ptr<Extension> _et;
+ std::unique_ptr<Extension> _et;
ClassHierarchy _classes;
diff --git a/libcore/asobj/Microphone_as.cpp b/libcore/asobj/Microphone_as.cpp
index bdcd3ec..11e8a4f 100644
--- a/libcore/asobj/Microphone_as.cpp
+++ b/libcore/asobj/Microphone_as.cpp
@@ -21,7 +21,6 @@
#include "Microphone_as.h"
#include <algorithm>
-#include <boost/scoped_ptr.hpp>
#include <memory>
#include "as_object.h" // for inheritance
@@ -226,7 +225,7 @@ public:
}
private:
- boost::scoped_ptr<media::AudioInput> _input;
+ std::unique_ptr<media::AudioInput> _input;
};
diff --git a/libcore/asobj/NetConnection_as.cpp
b/libcore/asobj/NetConnection_as.cpp
index 3bce9e9..4c6608f 100644
--- a/libcore/asobj/NetConnection_as.cpp
+++ b/libcore/asobj/NetConnection_as.cpp
@@ -26,7 +26,7 @@
#include <string>
#include <utility>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <boost/lexical_cast.hpp>
#include <boost/noncopyable.hpp>
#include <boost/mem_fn.hpp>
@@ -217,7 +217,7 @@ private:
size_t _calls;
/// A single HTTP request.
- boost::scoped_ptr<IOChannel> _connection;
+ std::unique_ptr<IOChannel> _connection;
/// Headers to be sent with this request.
NetworkAdapter::RequestHeaders _headers;
diff --git a/libcore/asobj/NetStream_as.h b/libcore/asobj/NetStream_as.h
index 8fef49e..c136fbd 100644
--- a/libcore/asobj/NetStream_as.h
+++ b/libcore/asobj/NetStream_as.h
@@ -28,7 +28,7 @@
#include <boost/intrusive_ptr.hpp>
#include <string>
#include <boost/ptr_container/ptr_deque.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <boost/thread/mutex.hpp>
#include "PlayHead.h" // for composition
@@ -503,7 +503,7 @@ private:
NetConnection_as* _netCon;
- boost::scoped_ptr<CharacterProxy> _audioController;
+ std::unique_ptr<CharacterProxy> _audioController;
// The size of the buffer in milliseconds
boost::uint32_t _bufferTime;
@@ -545,7 +545,7 @@ private:
bool _audioInfoKnown;
/// Virtual clock used as playback clock source
- boost::scoped_ptr<InterruptableVirtualClock> _playbackClock;
+ std::unique_ptr<InterruptableVirtualClock> _playbackClock;
/// Playback control device
PlayHead _playHead;
diff --git a/libcore/asobj/SharedObject_as.cpp
b/libcore/asobj/SharedObject_as.cpp
index 90f213b..9ba3dd4 100644
--- a/libcore/asobj/SharedObject_as.cpp
+++ b/libcore/asobj/SharedObject_as.cpp
@@ -24,7 +24,6 @@
#include "SharedObject_as.h"
-#include <boost/scoped_array.hpp>
#include <cstdio>
#include "movie_root.h"
@@ -900,7 +899,7 @@ readSOL(VM& vm, const std::string& filespec)
return data;
}
- boost::scoped_array<boost::uint8_t> sbuf(new boost::uint8_t[size]);
+ std::unique_ptr<boost::uint8_t[]> sbuf(new boost::uint8_t[size]);
const boost::uint8_t *buf = sbuf.get();
const boost::uint8_t *end = buf + size;
diff --git a/libcore/asobj/Sound_as.cpp b/libcore/asobj/Sound_as.cpp
index cbf2adc..ff7cdde 100644
--- a/libcore/asobj/Sound_as.cpp
+++ b/libcore/asobj/Sound_as.cpp
@@ -24,7 +24,6 @@
#include "Sound_as.h"
#include <string>
-#include <boost/scoped_array.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/cstdint.hpp>
#include <boost/optional.hpp>
@@ -200,7 +199,7 @@ private:
/// This is set by start()
boost::uint64_t _startTime;
- boost::scoped_array<boost::uint8_t> _leftOverData;
+ std::unique_ptr<boost::uint8_t[]> _leftOverData;
boost::uint8_t* _leftOverPtr;
boost::uint32_t _leftOverSize;
diff --git a/libcore/asobj/XMLSocket_as.cpp b/libcore/asobj/XMLSocket_as.cpp
index cea7fc5..0aee240 100644
--- a/libcore/asobj/XMLSocket_as.cpp
+++ b/libcore/asobj/XMLSocket_as.cpp
@@ -21,8 +21,7 @@
#include "XMLSocket_as.h"
#include <boost/thread.hpp>
-#include <boost/scoped_array.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <string>
#include "namedStrings.h"
@@ -193,7 +192,7 @@ XMLSocket_as::checkForIncomingData()
std::vector<std::string> msgs;
const int bufSize = 10000;
- boost::scoped_array<char> buf(new char[bufSize]);
+ std::unique_ptr<char[]> buf(new char[bufSize]);
const size_t bytesRead = _socket.readNonBlocking(buf.get(), bufSize - 1);
diff --git a/libcore/asobj/flash/display/BitmapData_as.h
b/libcore/asobj/flash/display/BitmapData_as.h
index 5690313..9733c1f 100644
--- a/libcore/asobj/flash/display/BitmapData_as.h
+++ b/libcore/asobj/flash/display/BitmapData_as.h
@@ -23,7 +23,7 @@
#include <list>
#include <boost/cstdint.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <cassert>
#include <boost/intrusive_ptr.hpp>
#include <memory>
@@ -166,7 +166,7 @@ private:
boost::intrusive_ptr<CachedBitmap> _cachedBitmap;
- boost::scoped_ptr<image::GnashImage> _image;
+ std::unique_ptr<image::GnashImage> _image;
std::list<DisplayObject*> _attachedObjects;
diff --git a/libcore/parser/SWFMovieDefinition.h
b/libcore/parser/SWFMovieDefinition.h
index 3817d44..8afe346 100644
--- a/libcore/parser/SWFMovieDefinition.h
+++ b/libcore/parser/SWFMovieDefinition.h
@@ -36,7 +36,7 @@
#include <boost/thread/thread.hpp>
#include <boost/thread/condition.hpp>
#include <boost/thread/barrier.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "movie_definition.h" // for inheritance
#include "DefinitionTag.h" // for boost::intrusive_ptr visibility of dtor
@@ -490,7 +490,7 @@ private:
std::string _url;
/// Non transferable stream.
- boost::scoped_ptr<SWFStream> _str;
+ std::unique_ptr<SWFStream> _str;
std::unique_ptr<IOChannel> _in;
diff --git a/libcore/swf/DefineBitsTag.cpp b/libcore/swf/DefineBitsTag.cpp
index 018257d..e360eb4 100644
--- a/libcore/swf/DefineBitsTag.cpp
+++ b/libcore/swf/DefineBitsTag.cpp
@@ -27,7 +27,6 @@
#include <limits>
#include <cassert>
#include <boost/static_assert.hpp>
-#include <boost/scoped_array.hpp>
#include "IOChannel.h"
#include "utility.h"
@@ -384,7 +383,7 @@ readDefineBitsJpeg3(SWFStream& in, TagType tag)
const size_t imHeight = im->height();
const size_t bufferLength = imWidth * imHeight;
- boost::scoped_array<boost::uint8_t> buffer(new
boost::uint8_t[bufferLength]);
+ std::unique_ptr<boost::uint8_t[]> buffer(new boost::uint8_t[bufferLength]);
inflateWrapper(in, buffer.get(), bufferLength);
@@ -480,7 +479,7 @@ readLossless(SWFStream& in, TagType tag)
const size_t pitch = (width * bytes_per_pixel + 3) &~ 3;
const size_t bufSize = colorTableSize * channels + pitch * height;
- boost::scoped_array<boost::uint8_t> buffer(new boost::uint8_t[bufSize]);
+ std::unique_ptr<boost::uint8_t[]> buffer(new boost::uint8_t[bufSize]);
inflateWrapper(in, buffer.get(), bufSize);
assert(in.tell() <= in.get_tag_end_position());
diff --git a/libcore/swf/DefineButtonTag.cpp b/libcore/swf/DefineButtonTag.cpp
index 9108c69..09eb9ba 100644
--- a/libcore/swf/DefineButtonTag.cpp
+++ b/libcore/swf/DefineButtonTag.cpp
@@ -51,7 +51,6 @@ DefineButtonTag::DefineButtonTag(SWFStream& in,
movie_definition& m,
TagType tag, boost::uint16_t id)
:
DefinitionTag(id),
- _soundTag(0),
_trackAsMenu(false),
_movieDef(m)
{
diff --git a/libcore/swf/DefineButtonTag.h b/libcore/swf/DefineButtonTag.h
index c7003fa..12004c0 100644
--- a/libcore/swf/DefineButtonTag.h
+++ b/libcore/swf/DefineButtonTag.h
@@ -22,7 +22,7 @@
#include <vector>
#include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <boost/cstdint.hpp>
#include <memory>
@@ -279,7 +279,7 @@ private:
/// Read a DEFINEBUTTON2 tag
void readDefineButton2Tag(SWFStream& in, movie_definition& m);
- boost::scoped_ptr<SWF::DefineButtonSoundTag> _soundTag;
+ std::unique_ptr<SWF::DefineButtonSoundTag> _soundTag;
ButtonRecords _buttonRecords;
diff --git a/libcore/vm/ASHandlers.cpp b/libcore/vm/ASHandlers.cpp
index 05121d1..cbfa635 100644
--- a/libcore/vm/ASHandlers.cpp
+++ b/libcore/vm/ASHandlers.cpp
@@ -26,7 +26,6 @@
#include <string>
#include <vector>
-#include <boost/scoped_array.hpp>
#include <boost/random.hpp>
#include <boost/lexical_cast.hpp>
#include <algorithm>
diff --git a/libdevice/DeviceGlue.h b/libdevice/DeviceGlue.h
index 37c51cc..4921627 100644
--- a/libdevice/DeviceGlue.h
+++ b/libdevice/DeviceGlue.h
@@ -25,7 +25,7 @@
#endif
#include <boost/shared_array.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "GnashDevice.h"
@@ -137,7 +137,7 @@ public:
}
protected:
- boost::scoped_ptr<renderer::GnashDevice> _device;
+ std::unique_ptr<renderer::GnashDevice> _device;
};
} // namespace gnash
diff --git a/libdevice/directfb/DirectFBDevice.h
b/libdevice/directfb/DirectFBDevice.h
index a7b29e5..468b1c2 100644
--- a/libdevice/directfb/DirectFBDevice.h
+++ b/libdevice/directfb/DirectFBDevice.h
@@ -24,8 +24,7 @@
#include "gnashconfig.h"
#endif
-#include <boost/scoped_array.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#ifdef HAVE_DIRECTFB_H
# include <directfb/directfb.h>
diff --git a/libdevice/egl/eglDevice.h b/libdevice/egl/eglDevice.h
index 5460cb2..401a069 100644
--- a/libdevice/egl/eglDevice.h
+++ b/libdevice/egl/eglDevice.h
@@ -24,8 +24,7 @@
#include "gnashconfig.h"
#endif
-#include <boost/scoped_array.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#ifdef HAVE_X11_X_H
#include "x11/X11Device.h"
diff --git a/libdevice/events/InputDevice.h b/libdevice/events/InputDevice.h
index 89cad2f..4a41c3c 100644
--- a/libdevice/events/InputDevice.h
+++ b/libdevice/events/InputDevice.h
@@ -22,9 +22,8 @@
#include "gnashconfig.h"
#endif
-#include <boost/scoped_array.hpp>
#include <boost/shared_array.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <boost/cstdint.hpp>
#include <vector>
#include <queue>
@@ -159,7 +158,7 @@ protected:
int _fd;
input_data_t _input_data;
// These hold the data queue
- boost::scoped_array<boost::uint8_t> _buffer;
+ std::unique_ptr<boost::uint8_t[]> _buffer;
std::queue<std::shared_ptr<input_data_t> > _data;
int _screen_width;
int _screen_height;
diff --git a/libdevice/rawfb/RawFBDevice.h b/libdevice/rawfb/RawFBDevice.h
index 3aaf83a..0b51e64 100644
--- a/libdevice/rawfb/RawFBDevice.h
+++ b/libdevice/rawfb/RawFBDevice.h
@@ -24,8 +24,7 @@
#include "gnashconfig.h"
#endif
-#include <boost/scoped_array.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
@@ -150,7 +149,7 @@ protected:
struct fb_var_screeninfo _varinfo;
boost::uint8_t *_fbmem;
- boost::scoped_ptr<boost::uint8_t> _offscreen_buffer;
+ std::unique_ptr<boost::uint8_t> _offscreen_buffer;
struct fb_cmap _cmap; // the colormap
};
diff --git a/libdevice/vaapi/VaapiDevice.h b/libdevice/vaapi/VaapiDevice.h
index 87ca998..c89cb93 100644
--- a/libdevice/vaapi/VaapiDevice.h
+++ b/libdevice/vaapi/VaapiDevice.h
@@ -24,8 +24,7 @@
#include "gnashconfig.h"
#endif
-#include <boost/scoped_array.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <va/va.h>
diff --git a/libdevice/vaapi/VaapiImage.h b/libdevice/vaapi/VaapiImage.h
index f17000e..b68c5e4 100644
--- a/libdevice/vaapi/VaapiImage.h
+++ b/libdevice/vaapi/VaapiImage.h
@@ -20,7 +20,6 @@
#ifndef GNASH_VAAPIIMAGE_H
#define GNASH_VAAPIIMAGE_H
-#include <boost/scoped_array.hpp>
#include <memory>
#include "dsodefs.h"
diff --git a/libdevice/x11/X11Device.h b/libdevice/x11/X11Device.h
index 5f143df..85836e5 100644
--- a/libdevice/x11/X11Device.h
+++ b/libdevice/x11/X11Device.h
@@ -24,8 +24,7 @@
#include "gnashconfig.h"
#endif
-#include <boost/scoped_array.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#ifdef HAVE_X11_X_H
# include <X11/X.h>
diff --git a/libmedia/AudioDecoderSimple.cpp b/libmedia/AudioDecoderSimple.cpp
index e750afa..586606e 100644
--- a/libmedia/AudioDecoderSimple.cpp
+++ b/libmedia/AudioDecoderSimple.cpp
@@ -28,7 +28,6 @@
#include "log.h"
-#include <boost/scoped_array.hpp>
#include <algorithm> // for std::swap
namespace gnash {
diff --git a/libmedia/AudioDecoderSpeex.cpp b/libmedia/AudioDecoderSpeex.cpp
index af3cf13..75fcaac 100644
--- a/libmedia/AudioDecoderSpeex.cpp
+++ b/libmedia/AudioDecoderSpeex.cpp
@@ -23,7 +23,6 @@
#include <functional>
#include <boost/checked_delete.hpp>
-#include <boost/scoped_array.hpp>
#include <boost/cstdint.hpp> // For C99 int types
#ifdef RESAMPLING_SPEEX
@@ -84,7 +83,7 @@ struct DecodedFrame : boost::noncopyable
size(datasize)
{}
- boost::scoped_array<boost::int16_t> data;
+ std::unique_ptr<boost::int16_t[]> data;
size_t size;
};
@@ -101,7 +100,7 @@ AudioDecoderSpeex::decode(const EncodedAudioFrame& input,
while (speex_bits_remaining(&_speex_bits)) {
- boost::scoped_array<short> output( new short[_speex_framesize] );
+ std::unique_ptr<short[]> output( new short[_speex_framesize] );
int rv = speex_decode_int(_speex_dec_state, &_speex_bits,
output.get());
if (rv != 0) {
diff --git a/libmedia/FLVParser.h b/libmedia/FLVParser.h
index 316bfd9..a9aa2d1 100644
--- a/libmedia/FLVParser.h
+++ b/libmedia/FLVParser.h
@@ -61,7 +61,7 @@ public:
}
/// Video stream header
- boost::scoped_array<boost::uint8_t> data;
+ std::unique_ptr<boost::uint8_t[]> data;
/// Video stream header size
size_t size;
@@ -93,7 +93,7 @@ public:
}
/// Audio stream header
- boost::scoped_array<boost::uint8_t> data;
+ std::unique_ptr<boost::uint8_t[]> data;
/// Audio stream header size
size_t size;
diff --git a/libmedia/MediaParser.h b/libmedia/MediaParser.h
index 86a3465..32d14b8 100644
--- a/libmedia/MediaParser.h
+++ b/libmedia/MediaParser.h
@@ -20,7 +20,6 @@
#ifndef GNASH_MEDIAPARSER_H
#define GNASH_MEDIAPARSER_H
-#include <boost/scoped_array.hpp>
#include <boost/thread/thread.hpp>
#include <boost/thread/condition.hpp>
#include <boost/thread/barrier.hpp>
@@ -410,7 +409,7 @@ public:
private:
boost::uint32_t _size;
- boost::scoped_array<boost::uint8_t> _data;
+ std::unique_ptr<boost::uint8_t[]> _data;
unsigned int _frameNum;
boost::uint64_t _timestamp;
};
@@ -420,7 +419,7 @@ class EncodedAudioFrame
{
public:
boost::uint32_t dataSize;
- boost::scoped_array<boost::uint8_t> data;
+ std::unique_ptr<boost::uint8_t[]> data;
boost::uint64_t timestamp;
// FIXME: should have better encapsulation for this sort of stuff.
diff --git a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
index ce51e88..e6169c8 100644
--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
@@ -406,7 +406,7 @@ AudioDecoderFfmpeg::decode(const boost::uint8_t* input,
// Now, decode the frame. We use the ::decodeFrame specialized function
// here so resampling is done appropriately
boost::uint32_t outSize = 0;
- boost::scoped_array<boost::uint8_t> outBuf(
+ std::unique_ptr<boost::uint8_t[]> outBuf(
decodeFrame(frame, framesize, outSize));
if (!outBuf)
diff --git a/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
b/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
index a65c39b..d4d2e15 100644
--- a/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
@@ -24,7 +24,6 @@
#include <cmath>
#include <vector>
-#include <boost/scoped_array.hpp>
namespace gnash {
namespace media {
diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
index e668df4..2e76bec 100644
--- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
@@ -66,7 +66,7 @@ MediaParserFfmpeg::probeStream()
const size_t probeSize = 4096;
const size_t bufSize = probeSize + FF_INPUT_BUFFER_PADDING_SIZE;
- boost::scoped_array<boost::uint8_t> buffer(new boost::uint8_t[bufSize]);
+ std::unique_ptr<boost::uint8_t[]> buffer(new boost::uint8_t[bufSize]);
assert(_stream->tell() == static_cast<std::streampos>(0));
size_t actuallyRead = _stream->read(buffer.get(), probeSize);
diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.h
b/libmedia/ffmpeg/MediaParserFfmpeg.h
index 8abeb67..dcc4c9e 100644
--- a/libmedia/ffmpeg/MediaParserFfmpeg.h
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.h
@@ -20,7 +20,6 @@
#ifndef GNASH_MEDIAPARSER_FFMPEG_H
#define GNASH_MEDIAPARSER_FFMPEG_H
-#include <boost/scoped_array.hpp>
#include <memory>
#include <boost/optional.hpp>
@@ -169,7 +168,7 @@ private:
///
static const size_t byteIOBufferSize = 1024;
- boost::scoped_array<unsigned char> _byteIOBuffer;
+ std::unique_ptr<unsigned char[]> _byteIOBuffer;
/// The last parsed position, for getBytesLoaded
boost::uint64_t _lastParsedPosition;
diff --git a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
index 24edf53..3178e6e 100644
--- a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
@@ -24,7 +24,6 @@
#include "VideoDecoderFfmpeg.h"
-#include <boost/scoped_array.hpp>
#include <boost/format.hpp>
#include <algorithm>
diff --git a/libmedia/gst/MediaParserGst.h b/libmedia/gst/MediaParserGst.h
index eb507ce..9fde206 100644
--- a/libmedia/gst/MediaParserGst.h
+++ b/libmedia/gst/MediaParserGst.h
@@ -21,7 +21,6 @@
#define GNASH_MEDIAPARSER_GST_H
#include <deque>
-#include <boost/scoped_array.hpp>
#include <memory>
#include <queue>
#include <gst/gst.h>
diff --git a/libmedia/haiku/MediaParserHaiku.h
b/libmedia/haiku/MediaParserHaiku.h
index 92093d0..d58e5fa 100644
--- a/libmedia/haiku/MediaParserHaiku.h
+++ b/libmedia/haiku/MediaParserHaiku.h
@@ -22,7 +22,6 @@
#include "MediaParser.h" // for inheritance
-#include <boost/scoped_array.hpp>
#include <memory>
// Forward declaration
diff --git a/librender/agg/Renderer_agg.cpp b/librender/agg/Renderer_agg.cpp
index 4e313e5..6325bfb 100644
--- a/librender/agg/Renderer_agg.cpp
+++ b/librender/agg/Renderer_agg.cpp
@@ -114,7 +114,6 @@ AGG resources
#include <cmath>
#include <math.h> // We use round()!
#include <climits>
-#include <boost/scoped_array.hpp>
#include <functional>
#pragma GCC diagnostic push
@@ -387,7 +386,7 @@ private:
Mask _amask;
// in-memory buffer
- boost::scoped_array<boost::uint8_t> _buffer;
+ std::unique_ptr<boost::uint8_t[]> _buffer;
};
@@ -2010,10 +2009,10 @@ private: // private variables
typedef agg::renderer_base<PixelFormat> renderer_base;
// renderer base
- boost::scoped_ptr<renderer_base> m_rbase;
+ std::unique_ptr<renderer_base> m_rbase;
// An external renderer.
- boost::scoped_ptr<Renderer> _external;
+ std::unique_ptr<Renderer> _external;
int xres;
int yres;
diff --git a/librender/agg/Renderer_agg_bitmap.h
b/librender/agg/Renderer_agg_bitmap.h
index cfb6508..7905766 100644
--- a/librender/agg/Renderer_agg_bitmap.h
+++ b/librender/agg/Renderer_agg_bitmap.h
@@ -19,7 +19,7 @@
#ifndef BACKEND_RENDER_HANDLER_AGG_BITMAP_H
#define BACKEND_RENDER_HANDLER_AGG_BITMAP_H
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <memory>
#include <boost/cstdint.hpp>
@@ -60,7 +60,7 @@ public:
private:
- boost::scoped_ptr<image::GnashImage> _image;
+ std::unique_ptr<image::GnashImage> _image;
int _bpp;
diff --git a/librender/cairo/Renderer_cairo.cpp
b/librender/cairo/Renderer_cairo.cpp
index 0ad579f..2c39e37 100644
--- a/librender/cairo/Renderer_cairo.cpp
+++ b/librender/cairo/Renderer_cairo.cpp
@@ -40,8 +40,7 @@
#include <cmath>
#include <math.h> // Non standard rint()
#include <cairo/cairo.h>
-#include <boost/scoped_array.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <functional>
#include "Renderer.h"
@@ -207,8 +206,8 @@ class bitmap_info_cairo : public CachedBitmap,
boost::noncopyable
}
private:
- mutable boost::scoped_ptr<image::GnashImage> _image;
- boost::scoped_array<boost::uint8_t> _data;
+ mutable std::unique_ptr<image::GnashImage> _image;
+ std::unique_ptr<boost::uint8_t[]> _data;
int _width;
int _height;
size_t _bytes_per_pixel;
diff --git a/librender/cairo/Renderer_cairo.h b/librender/cairo/Renderer_cairo.h
index c601271..1583e9d 100644
--- a/librender/cairo/Renderer_cairo.h
+++ b/librender/cairo/Renderer_cairo.h
@@ -21,7 +21,6 @@
#define BACKEND_RENDER_HANDLER_CAIRO_H
#include <vector>
-#include <boost/scoped_array.hpp>
#include <cairo/cairo.h>
#include "Renderer.h"
#include "Geometry.h"
@@ -127,7 +126,7 @@ public:
private:
/// The cairo context.
cairo_t* _cr;
- boost::scoped_array<boost::uint8_t> _video_buffer;
+ std::unique_ptr<boost::uint8_t[]> _video_buffer;
std::vector<PathVec> _masks;
size_t _video_bufsize;
bool _drawing_mask;
diff --git a/librender/opengl/Renderer_ogl.cpp
b/librender/opengl/Renderer_ogl.cpp
index dec8504..c5d5003 100644
--- a/librender/opengl/Renderer_ogl.cpp
+++ b/librender/opengl/Renderer_ogl.cpp
@@ -28,7 +28,7 @@
#include <list>
#include <cstring>
#include <cmath>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "swf/ShapeRecord.h"
#include "GnashEnums.h"
@@ -164,8 +164,8 @@ private:
void setup() const;
void upload(boost::uint8_t* data, size_t width, size_t height) const;
- mutable boost::scoped_ptr<image::GnashImage> _img;
- mutable boost::scoped_ptr<image::GnashImage> _cache;
+ mutable std::unique_ptr<image::GnashImage> _img;
+ mutable std::unique_ptr<image::GnashImage> _cache;
GLenum _pixel_format;
GLenum _ogl_img_type;
mutable bool _ogl_accessible;
@@ -279,7 +279,7 @@ public:
private:
size_t _width;
size_t _height;
- boost::scoped_array<boost::uint8_t> _buffer;
+ std::unique_ptr<boost::uint8_t[]> _buffer;
OSMesaContext _context;
};
@@ -596,7 +596,7 @@ bitmap_info_ogl::setup() const
while (h < _img->height()) { h <<= 1; }
}
- boost::scoped_array<boost::uint8_t> resized_data(
+ std::unique_ptr<boost::uint8_t[]> resized_data(
new boost::uint8_t[w * h * _img->channels()]);
// Q: Would mipmapping these textures aid in performance?
diff --git a/librender/openvg/OpenVGBitmap.cpp
b/librender/openvg/OpenVGBitmap.cpp
index 2482981..2fffe61 100644
--- a/librender/openvg/OpenVGBitmap.cpp
+++ b/librender/openvg/OpenVGBitmap.cpp
@@ -16,7 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <iostream>
#include "Geometry.h"
@@ -170,7 +170,7 @@ OpenVGBitmap::createRadialBitmap(float cx, float cy, float
fx, float fy,
// Color Ramp is the same as for linear gradient
size_t entries = records.size() * 5;
- boost::scoped_array<VGfloat> ramps(new VGfloat[entries]);
+ std::unique_ptr<VGfloat[]> ramps(new VGfloat[entries]);
int j = 0;
for (size_t i=0; i!= records.size(); ++i) {
@@ -235,7 +235,7 @@ OpenVGBitmap::createLinearBitmap(float x0, float y0, float
x1, float y1,
// function will generate an error if the number of values
// submitted is not a multiple of 5 (zero is acceptable)
size_t entries = records.size() * 5;
- boost::scoped_array<VGfloat> ramps(new VGfloat[entries]);
+ std::unique_ptr<VGfloat[]> ramps(new VGfloat[entries]);
int j = 0;
for (size_t i=0; i!= records.size(); ++i) {
std::cerr << "The record ratio is: " << records[i].ratio/255.0f;
diff --git a/librender/openvg/OpenVGBitmap.h b/librender/openvg/OpenVGBitmap.h
index fd812d9..d2b4b21 100644
--- a/librender/openvg/OpenVGBitmap.h
+++ b/librender/openvg/OpenVGBitmap.h
@@ -76,7 +76,7 @@ public:
CachedBitmap *bitmap, VGPaint paint);
private:
- boost::scoped_ptr<image::GnashImage> _image;
+ std::unique_ptr<image::GnashImage> _image;
VGImageFormat _pixel_format;
VGImage _vgimage;
VGPaint _vgpaint;
diff --git a/librender/openvg/OpenVGRenderer.h
b/librender/openvg/OpenVGRenderer.h
index 6257461..de520a6 100644
--- a/librender/openvg/OpenVGRenderer.h
+++ b/librender/openvg/OpenVGRenderer.h
@@ -32,8 +32,7 @@
#include <EGL/egl.h>
#include <vector>
#include <list>
-#include <boost/scoped_array.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "Geometry.h"
#include "Renderer.h"
diff --git a/libsound/EmbedSound.h b/libsound/EmbedSound.h
index 8f421dc..738aa6a 100644
--- a/libsound/EmbedSound.h
+++ b/libsound/EmbedSound.h
@@ -24,7 +24,7 @@
#include <memory> // for unique_ptr (composition)
#include <cassert>
#include <boost/thread/mutex.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "SimpleBuffer.h" // for composition
#include "SoundInfo.h" // for composition
@@ -176,7 +176,7 @@ public:
private:
/// The undecoded data
- boost::scoped_ptr<SimpleBuffer> _buf;
+ std::unique_ptr<SimpleBuffer> _buf;
/// Playing instances of this sound definition
//
diff --git a/libsound/LiveSound.h b/libsound/LiveSound.h
index 8da4719..08187e8 100644
--- a/libsound/LiveSound.h
+++ b/libsound/LiveSound.h
@@ -20,7 +20,7 @@
#ifndef SOUND_LIVESOUND_H
#define SOUND_LIVESOUND_H
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <cassert>
#include <boost/cstdint.hpp> // For C99 int types
@@ -143,7 +143,7 @@ private:
/// Number of samples fetched so far.
unsigned long _samplesFetched;
- boost::scoped_ptr<media::AudioDecoder> _decoder;
+ std::unique_ptr<media::AudioDecoder> _decoder;
/// The decoded buffer
SimpleBuffer _decodedData;
diff --git a/libsound/StreamingSound.h b/libsound/StreamingSound.h
index 45cfb40..bce7227 100644
--- a/libsound/StreamingSound.h
+++ b/libsound/StreamingSound.h
@@ -20,7 +20,7 @@
#ifndef SOUND_STREAMINGSOUND_H
#define SOUND_STREAMINGSOUND_H
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <cassert>
#include <boost/cstdint.hpp> // For C99 int types
diff --git a/libsound/StreamingSoundData.h b/libsound/StreamingSoundData.h
index af1b1a5..0113e2d 100644
--- a/libsound/StreamingSoundData.h
+++ b/libsound/StreamingSoundData.h
@@ -24,7 +24,7 @@
#include <memory>
#include <cassert>
#include <boost/thread/mutex.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <boost/ptr_container/ptr_vector.hpp>
#include "SoundInfo.h"
diff --git a/libsound/aos4/sound_handler_ahi.cpp
b/libsound/aos4/sound_handler_ahi.cpp
index 5aea48e..0297d75 100644
--- a/libsound/aos4/sound_handler_ahi.cpp
+++ b/libsound/aos4/sound_handler_ahi.cpp
@@ -32,7 +32,6 @@
//#include <cmath>
#include <vector>
-#include <boost/scoped_array.hpp>
#include <proto/dos.h>
#include <proto/exec.h>
diff --git a/libsound/mkit/sound_handler_mkit.cpp
b/libsound/mkit/sound_handler_mkit.cpp
index ca87319..cc53cdf 100644
--- a/libsound/mkit/sound_handler_mkit.cpp
+++ b/libsound/mkit/sound_handler_mkit.cpp
@@ -28,7 +28,6 @@
#include "GnashException.h" // for SoundException
#include <vector>
-#include <boost/scoped_array.hpp>
#include <SoundPlayer.h>
diff --git a/libsound/mkit/sound_handler_mkit.h
b/libsound/mkit/sound_handler_mkit.h
index 21e5344..2dead4f 100644
--- a/libsound/mkit/sound_handler_mkit.h
+++ b/libsound/mkit/sound_handler_mkit.h
@@ -24,7 +24,7 @@
#include <set> // for composition (InputStreams)
#include <boost/thread/mutex.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <SoundPlayer.h>
@@ -43,7 +43,7 @@ namespace sound {
/// Mkit media kit based sound_handler
class Mkit_sound_handler : public sound_handler
{
- boost::scoped_ptr<BSoundPlayer> _soundplayer;
+ std::unique_ptr<BSoundPlayer> _soundplayer;
/// play buffer handler function
static void FillNextBuffer(void *cookie, void *buffer, size_t size,
diff --git a/libsound/sdl/sound_handler_sdl.cpp
b/libsound/sdl/sound_handler_sdl.cpp
index a4324d5..486fcde 100644
--- a/libsound/sdl/sound_handler_sdl.cpp
+++ b/libsound/sdl/sound_handler_sdl.cpp
@@ -31,7 +31,6 @@
#include "GnashException.h" // for SoundException
#include <vector>
-#include <boost/scoped_array.hpp>
#include <SDL.h>
// Define this to get debugging call about pausing/unpausing audio
diff --git a/libsound/sound_handler.cpp b/libsound/sound_handler.cpp
index c9e0686..1b0ed2f 100644
--- a/libsound/sound_handler.cpp
+++ b/libsound/sound_handler.cpp
@@ -22,7 +22,6 @@
#include <boost/cstdint.hpp> // For C99 int types
#include <vector>
#include <cmath>
-#include <boost/scoped_array.hpp>
#include "EmbedSound.h" // for use
#include "InputStream.h" // for use
@@ -596,7 +595,7 @@ sound_handler::fetchSamples(boost::int16_t* to, unsigned
int nSamples)
if (!_inputStreams.empty()) {
// A buffer to fetch InputStream samples into
- boost::scoped_array<boost::int16_t> buf(new boost::int16_t[nSamples]);
+ std::unique_ptr<boost::int16_t[]> buf(new boost::int16_t[nSamples]);
#ifdef GNASH_DEBUG_SAMPLES_FETCHING
log_debug("Fetching %d samples from each of %d input streams",
nSamples, _inputStreams.size());
diff --git a/libsound/sound_handler.h b/libsound/sound_handler.h
index 15711a3..f4cb1eb 100644
--- a/libsound/sound_handler.h
+++ b/libsound/sound_handler.h
@@ -23,12 +23,11 @@
#include "gnashconfig.h"
#endif
-#include <string>
-#include <vector>
-#include <memory>
#include <limits>
+#include <memory>
#include <set>
-#include <boost/scoped_ptr.hpp>
+#include <string>
+#include <vector>
#include "dsodefs.h" // for DSOEXPORT
#include "SoundEnvelope.h" // for SoundEnvelopes typedef
@@ -535,7 +534,7 @@ private:
/// Unplug any completed input stream
void unplugCompletedInputStreams();
- boost::scoped_ptr<WAVWriter> _wavWriter;
+ std::unique_ptr<WAVWriter> _wavWriter;
};
diff --git a/plugin/npapi/external.cpp b/plugin/npapi/external.cpp
index 280a28e..e70bbe0 100644
--- a/plugin/npapi/external.cpp
+++ b/plugin/npapi/external.cpp
@@ -21,7 +21,7 @@
#endif
#include <boost/algorithm/string/erase.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <string>
#include <sstream>
diff --git a/plugin/npapi/plugin.cpp b/plugin/npapi/plugin.cpp
index f507d5d..642a6e7 100644
--- a/plugin/npapi/plugin.cpp
+++ b/plugin/npapi/plugin.cpp
@@ -22,7 +22,6 @@
#endif
#include <boost/format.hpp>
-#include <boost/scoped_array.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/algorithm/string/find.hpp>
#define BOOST_IOSTREAMS_USE_DEPRECATED
@@ -934,7 +933,7 @@ nsPluginInstance::processPlayerRequest()
if (!invoke->name.empty() && !invoke->args.empty()) {
//Convert the as_value argument to NPVariant
const size_t count = invoke->args.size() - 1;
- boost::scoped_array<NPVariant> args(new NPVariant[count]);
+ std::unique_ptr<NPVariant[]> args(new NPVariant[count]);
//Skip the first argument
for (size_t i = 0; i < count; ++i) {
invoke->args[i+1].copy(args[i]);
diff --git a/testsuite/libcore.all/BitsReaderTest.cpp
b/testsuite/libcore.all/BitsReaderTest.cpp
index 0f2e580..43e0a38 100644
--- a/testsuite/libcore.all/BitsReaderTest.cpp
+++ b/testsuite/libcore.all/BitsReaderTest.cpp
@@ -40,7 +40,6 @@
#include <fcntl.h>
#include <string.h>
#include <sstream>
-#include <boost/scoped_array.hpp>
using namespace std;
using namespace gnash;
@@ -81,7 +80,7 @@ trymain(int /*argc*/, char** /*argv*/)
{
ByteReader in(0xAA);
- boost::scoped_array<unsigned char> buf(new unsigned char[1024]);
+ std::unique_ptr<unsigned char[]> buf(new unsigned char[1024]);
in.read(buf.get(), 1024);
diff --git a/testsuite/libcore.all/ClassSizes.cpp
b/testsuite/libcore.all/ClassSizes.cpp
index 2713f04..bf91c59 100644
--- a/testsuite/libcore.all/ClassSizes.cpp
+++ b/testsuite/libcore.all/ClassSizes.cpp
@@ -56,7 +56,6 @@
#include <cmath>
#include <string>
#include <memory>
-#include <boost/scoped_ptr.hpp>
#include "check.h"
-----------------------------------------------------------------------
Summary of changes:
cygnal/cgi-bin/echo/echo.h | 1 -
cygnal/cgi-bin/echo/gateway.h | 1 -
cygnal/cgi-bin/fitcDemo/fitcDemo.h | 1 -
cygnal/cgi-bin/oflaDemo/oflaDemo.cpp | 4 +-
cygnal/cgi-bin/oflaDemo/oflaDemo.h | 1 -
cygnal/handler.cpp | 2 +-
cygnal/handler.h | 2 +-
cygnal/http_server.cpp | 1 -
cygnal/http_server.h | 1 -
cygnal/libamf/buffer.cpp | 2 +-
cygnal/libamf/buffer.h | 3 +-
cygnal/libamf/element.h | 2 +-
cygnal/libamf/sol.cpp | 7 +-
cygnal/libnet/cache.cpp | 1 -
cygnal/libnet/diskstream.h | 2 +-
cygnal/libnet/http.cpp | 1 -
cygnal/libnet/http.h | 1 -
cygnal/libnet/network.h | 6 +-
cygnal/libnet/rtmp.h | 2 +-
cygnal/libnet/rtmp_client.cpp | 4 +-
cygnal/libnet/sshclient.cpp | 1 -
cygnal/libnet/sshclient.h | 1 -
cygnal/libnet/sshserver.cpp | 1 -
cygnal/libnet/sshserver.h | 1 -
cygnal/libnet/sslclient.cpp | 1 -
cygnal/libnet/sslclient.h | 9 +--
cygnal/libnet/sslserver.cpp | 1 -
cygnal/libnet/sslserver.h | 1 -
cygnal/rtmp_server.cpp | 6 +-
gui/dump/dump.cpp | 1 -
gui/dump/dump.h | 3 +-
gui/fb/fb_glue.h | 2 +-
gui/fb/fb_glue_agg.h | 2 +-
gui/fb/fb_glue_gles1.h | 4 +-
gui/fb/fbsup.h | 1 -
gui/gtk/gtk_glue_agg.h | 1 -
gui/gtk/gtk_glue_agg_vaapi.h | 1 -
gui/gtk/gtk_glue_gtkglext.h | 1 -
gui/gtk/gtk_glue_ovg.h | 3 +-
gui/gui.h | 4 +-
gui/qt/Qt4GlueAgg.h | 3 +-
gui/qt/Qt4GlueCairo.h | 3 +-
gui/qt/Qt4GlueOgl.h | 1 -
gui/qt/kde_glue_agg.h | 3 +-
libbase/GnashImage.cpp | 3 +-
libbase/GnashImage.h | 3 +-
libbase/GnashImageGif.cpp | 5 +-
libbase/GnashImageJpeg.cpp | 2 +-
libbase/GnashImagePng.cpp | 11 +--
libbase/GnashScopedPtr.h | 85 ---------------------------
libbase/Makefile.am | 2 -
libbase/RTMP.h | 6 +-
libbase/SimpleBuffer.h | 6 +-
libbase/Socket.cpp | 7 +-
libbase/URL.cpp | 3 +-
libbase/noseek_fd_adapter.cpp | 1 -
libcore/ExternalInterface.cpp | 3 +-
libcore/Font.cpp | 1 -
libcore/Font.h | 4 +-
libcore/LoadVariablesThread.cpp | 3 +-
libcore/abc/AbcBlock.h | 1 -
libcore/as_object.cpp | 2 -
libcore/as_object.h | 6 +-
libcore/asobj/Camera_as.cpp | 4 +-
libcore/asobj/Global_as.h | 4 +-
libcore/asobj/Microphone_as.cpp | 3 +-
libcore/asobj/NetConnection_as.cpp | 4 +-
libcore/asobj/NetStream_as.h | 6 +-
libcore/asobj/SharedObject_as.cpp | 3 +-
libcore/asobj/Sound_as.cpp | 3 +-
libcore/asobj/XMLSocket_as.cpp | 5 +-
libcore/asobj/flash/display/BitmapData_as.h | 4 +-
libcore/parser/SWFMovieDefinition.h | 4 +-
libcore/swf/DefineBitsTag.cpp | 5 +-
libcore/swf/DefineButtonTag.cpp | 1 -
libcore/swf/DefineButtonTag.h | 4 +-
libcore/vm/ASHandlers.cpp | 1 -
libdevice/DeviceGlue.h | 4 +-
libdevice/directfb/DirectFBDevice.h | 3 +-
libdevice/egl/eglDevice.h | 3 +-
libdevice/events/InputDevice.h | 5 +-
libdevice/rawfb/RawFBDevice.h | 5 +-
libdevice/vaapi/VaapiDevice.h | 3 +-
libdevice/vaapi/VaapiImage.h | 1 -
libdevice/x11/X11Device.h | 3 +-
libmedia/AudioDecoderSimple.cpp | 1 -
libmedia/AudioDecoderSpeex.cpp | 5 +-
libmedia/FLVParser.h | 4 +-
libmedia/MediaParser.h | 5 +-
libmedia/ffmpeg/AudioDecoderFfmpeg.cpp | 8 +-
libmedia/ffmpeg/AudioResamplerFfmpeg.cpp | 1 -
libmedia/ffmpeg/MediaParserFfmpeg.cpp | 2 +-
libmedia/ffmpeg/MediaParserFfmpeg.h | 3 +-
libmedia/ffmpeg/VideoDecoderFfmpeg.cpp | 1 -
libmedia/gst/MediaParserGst.h | 1 -
libmedia/haiku/MediaParserHaiku.h | 1 -
librender/agg/Renderer_agg.cpp | 7 +-
librender/agg/Renderer_agg_bitmap.h | 4 +-
librender/cairo/Renderer_cairo.cpp | 7 +-
librender/cairo/Renderer_cairo.h | 3 +-
librender/opengl/Renderer_ogl.cpp | 10 ++--
librender/openvg/OpenVGBitmap.cpp | 6 +-
librender/openvg/OpenVGBitmap.h | 2 +-
librender/openvg/OpenVGRenderer.h | 3 +-
libsound/EmbedSound.h | 4 +-
libsound/LiveSound.h | 4 +-
libsound/StreamingSound.h | 2 +-
libsound/StreamingSoundData.h | 2 +-
libsound/aos4/sound_handler_ahi.cpp | 1 -
libsound/mkit/sound_handler_mkit.cpp | 1 -
libsound/mkit/sound_handler_mkit.h | 4 +-
libsound/sdl/sound_handler_sdl.cpp | 1 -
libsound/sound_handler.cpp | 3 +-
libsound/sound_handler.h | 9 +--
plugin/npapi/external.cpp | 2 +-
plugin/npapi/plugin.cpp | 3 +-
testsuite/libcore.all/BitsReaderTest.cpp | 3 +-
testsuite/libcore.all/ClassSizes.cpp | 1 -
118 files changed, 141 insertions(+), 305 deletions(-)
delete mode 100644 libbase/GnashScopedPtr.h
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2013-g805ee17,
Bastiaan Jacques <=