[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-2034-gba743ab |
|
Date: |
Tue, 20 May 2014 20:15:14 +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 ba743ab96334ac0573e323019f0df2b85dddd64e (commit)
via 6cccede8e878cc9d3fbc2cbfad2d97fef5a09178 (commit)
via d6f6432653bc4e1814a23f42e1edca00ae080483 (commit)
via dbc093032b13e8af2819e8eec6da87a05feb20b8 (commit)
via e968e2edd32478264cb1ade0949b8fb0497a7e0f (commit)
via cb90d701eb0ce1da20e4860789a3376c44dad7bd (commit)
from 95f1aa7ebdf6d916050d1630a8dee5c37e9029fb (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=ba743ab96334ac0573e323019f0df2b85dddd64e
commit ba743ab96334ac0573e323019f0df2b85dddd64e
Author: Bastiaan Jacques <address@hidden>
Date: Tue May 20 22:13:44 2014 +0200
Replace boost::shared_array with std::unique_ptr<T[]>.
The shared array pointers created in these instances were never
actually being shared, and so a unique_ptr is adequate to the task.
diff --git a/cygnal/handler.h b/cygnal/handler.h
index 96f76e4..a063eae 100644
--- a/cygnal/handler.h
+++ b/cygnal/handler.h
@@ -262,7 +262,6 @@ protected:
/// \var _diskstreams
/// This is all the opened disk based files that are currently
/// being streamed by the server.
- // boost::shared_array<gnash::DiskStream> _diskstreams;
std::map<int, std::shared_ptr<gnash::DiskStream> > _diskstreams;
/// \var _protocol
/// this is the map of which protocol is being used by which
diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 883076e..fd65aaa 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -755,7 +755,7 @@ FBGui::checkForData()
#endif
// Range check and convert the position from relative to
// absolute
- boost::shared_array<int> coords =
+ std::unique_ptr<int[]> coords =
InputDevice::convertAbsCoords(ie->x, ie->y,
getStage()->getStageWidth(),
getStage()->getStageHeight());
diff --git a/gui/fb/fb_glue_ovg.cpp b/gui/fb/fb_glue_ovg.cpp
index 42e1c0e..ea1dbe1 100644
--- a/gui/fb/fb_glue_ovg.cpp
+++ b/gui/fb/fb_glue_ovg.cpp
@@ -64,7 +64,7 @@ FBOvgGlue::init(int argc, char **argv[])
bool dfb = false;
bool x11 = false;
// Probe to see what display devices we have that could be used.
- boost::shared_array<renderer::GnashDevice::dtype_t> devs = probeDevices();
+ std::unique_ptr<renderer::GnashDevice::dtype_t[]> devs = probeDevices();
if (devs) {
int i = 0;
while (devs[i] != renderer::GnashDevice::GNASH_NODEV) {
diff --git a/gui/gtk/gtk_glue_ovg.cpp b/gui/gtk/gtk_glue_ovg.cpp
index df4b4e1..657f995 100644
--- a/gui/gtk/gtk_glue_ovg.cpp
+++ b/gui/gtk/gtk_glue_ovg.cpp
@@ -79,7 +79,7 @@ GtkOvgGlue::init(int /*argc*/, char ** /*argv*/[])
bool x11 = false;
// Probe to see what display devices we have that could be used.
- boost::shared_array<renderer::GnashDevice::dtype_t> devs = probeDevices();
+ std::unique_ptr<renderer::GnashDevice::dtype_t[]> devs = probeDevices();
if (devs) {
int i = 0;
while (devs[i] != renderer::GnashDevice::GNASH_NODEV) {
diff --git a/libdevice/DeviceGlue.h b/libdevice/DeviceGlue.h
index 4921627..ca5ddda 100644
--- a/libdevice/DeviceGlue.h
+++ b/libdevice/DeviceGlue.h
@@ -24,7 +24,6 @@
#include "gnashconfig.h"
#endif
-#include <boost/shared_array.hpp>
#include <memory>
#include "GnashDevice.h"
@@ -45,7 +44,7 @@ public:
/// available.
///
/// @return a list of devices
- boost::shared_array<renderer::GnashDevice::dtype_t> probeDevices() {
+ std::unique_ptr<renderer::GnashDevice::dtype_t[]> probeDevices() {
GNASH_REPORT_FUNCTION;
size_t total = 0;
@@ -62,7 +61,7 @@ public:
total++;
#endif
total++; // add one more for the list terminator
- boost::shared_array<renderer::GnashDevice::dtype_t> devs
+ std::unique_ptr<renderer::GnashDevice::dtype_t[]> devs
(new renderer::GnashDevice::dtype_t[total]);
// terminate the list so it can easily be walked through later.
devs[--total] = renderer::GnashDevice::GNASH_NODEV;
diff --git a/libdevice/events/EventDevice.cpp b/libdevice/events/EventDevice.cpp
index cd03438..aa2e8c8 100644
--- a/libdevice/events/EventDevice.cpp
+++ b/libdevice/events/EventDevice.cpp
@@ -261,7 +261,7 @@ EventDevice::check()
}
// Try to read something from the device
- boost::shared_array<boost::uint8_t> buf = readData(sizeof( struct
input_event));
+ std::unique_ptr<boost::uint8_t[]> buf = readData(sizeof( struct
input_event));
// time,type,code,value
if (!buf) {
return false;
diff --git a/libdevice/events/InputDevice.cpp b/libdevice/events/InputDevice.cpp
index ba8b9db..efd9443 100644
--- a/libdevice/events/InputDevice.cpp
+++ b/libdevice/events/InputDevice.cpp
@@ -108,12 +108,12 @@ InputDevice::addData(bool pressed, key::code key, int
modifier, int x, int y)
}
// Read data into the Device input buffer.
-boost::shared_array<boost::uint8_t>
+std::unique_ptr<boost::uint8_t[]>
InputDevice::readData(size_t size)
{
// GNASH_REPORT_FUNCTION;
- boost::shared_array<boost::uint8_t> inbuf;
+ std::unique_ptr<boost::uint8_t[]> inbuf;
if (_fd < 0) {
return inbuf; // no mouse available
@@ -175,11 +175,11 @@ InputDevice::dump() const
// The Babbage touchscreen gives is relative coordinates, but they don't
// match the actual screen resolution. So we convert the coordinates
// to a new absolute location.
-boost::shared_array<int>
+std::unique_ptr<int[]>
InputDevice::convertAbsCoords(int x, int y, int width, int height)
{
// GNASH_REPORT_FUNCTION;
- boost::shared_array<int> coords(new int[2]);
+ std::unique_ptr<int[]> coords(new int[2]);
coords[0] = int((x/256) * width);
coords[1] = int((y/256) * height);
diff --git a/libdevice/events/InputDevice.h b/libdevice/events/InputDevice.h
index 4a41c3c..1924a6c 100644
--- a/libdevice/events/InputDevice.h
+++ b/libdevice/events/InputDevice.h
@@ -22,7 +22,6 @@
#include "gnashconfig.h"
#endif
-#include <boost/shared_array.hpp>
#include <memory>
#include <boost/cstdint.hpp>
#include <vector>
@@ -128,7 +127,7 @@ public:
void setType(InputDevice::devicetype_e x) { _type = x; };
// Read data into the Device input buffer.
- boost::shared_array<boost::uint8_t> readData(size_t size);
+ std::unique_ptr<boost::uint8_t[]> readData(size_t size);
std::shared_ptr<input_data_t> popData()
{
std::shared_ptr<InputDevice::input_data_t> input;
@@ -140,7 +139,7 @@ public:
return input;
}
- static DSOEXPORT boost::shared_array<int> convertAbsCoords(int x, int y,
+ static DSOEXPORT std::unique_ptr<int[]> convertAbsCoords(int x, int y,
int width, int height);
void setScreenSize(int x, int y)
diff --git a/libdevice/events/MouseDevice.cpp b/libdevice/events/MouseDevice.cpp
index 3ef977b..b14aeba 100644
--- a/libdevice/events/MouseDevice.cpp
+++ b/libdevice/events/MouseDevice.cpp
@@ -24,7 +24,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
-#include <boost/shared_array.hpp>
#include "GnashSleep.h"
#include "log.h"
@@ -239,7 +238,7 @@ MouseDevice::check()
// GNASH_REPORT_FUNCTION;
int xmove, ymove, btn;
- boost::shared_array<boost::uint8_t> buf;
+ std::unique_ptr<boost::uint8_t[]> buf;
if (_type == InputDevice::TOUCHMOUSE) {
// The eTurboTouch has a 4 byte packet
buf = readData(4);
@@ -339,7 +338,7 @@ MouseDevice::check()
if (_input_data.y < 0) {
_input_data.y = 0;
}
- boost::shared_array<int> coords =
+ std::unique_ptr<int[]> coords =
InputDevice::convertAbsCoords(_input_data.x, _input_data.y,
_screen_width, _screen_height);
// MouseDevice::convertCoordinates(_input_data.x, _input_data.y,
diff --git a/libdevice/events/TouchDevice.cpp b/libdevice/events/TouchDevice.cpp
index 2e7d936..7b8bdd9 100644
--- a/libdevice/events/TouchDevice.cpp
+++ b/libdevice/events/TouchDevice.cpp
@@ -128,7 +128,7 @@ TouchDevice::check()
// arguments are a range, so hardcoding them is safe for
// now. In the future more conversion may be done, making this
// then be incorrect.
- boost::shared_array<int> coords =
+ std::unique_ptr<int[]> coords =
InputDevice::convertAbsCoords(event.x, event.y,
_screen_width, _screen_height);
log_debug(_("Touched x: %d, y: %d"), event.x , event.y);
diff --git a/libdevice/events/UinputDevice.cpp
b/libdevice/events/UinputDevice.cpp
index c78df71..033ef4a 100644
--- a/libdevice/events/UinputDevice.cpp
+++ b/libdevice/events/UinputDevice.cpp
@@ -24,7 +24,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
-#include <boost/shared_array.hpp>
#include "GnashSleep.h"
#include "log.h"
diff --git a/librender/testr.cpp b/librender/testr.cpp
index 8f10c14..167b419 100644
--- a/librender/testr.cpp
+++ b/librender/testr.cpp
@@ -313,7 +313,7 @@ test_device(Renderer *renderer, const std::string &type)
cout << endl << "Testing " << type << " Device" << endl;
#if 0
- boost::shared_array<renderer::GnashDevice::dtype_t> devs =
renderer->probeDevices();
+ std::unique_ptr<renderer::GnashDevice::dtype_t[]> devs =
renderer->probeDevices();
if (devs) {
runtest.pass("Renderer::probeDevices()");
} else {
diff --git a/testsuite/libdevice.all/test_events.cpp
b/testsuite/libdevice.all/test_events.cpp
index bc6b0c4..8fa350a 100644
--- a/testsuite/libdevice.all/test_events.cpp
+++ b/testsuite/libdevice.all/test_events.cpp
@@ -109,7 +109,7 @@ main(int argc, char *argv[])
cerr << ", " << ie->key << ", " << ie->modifier;
cerr << ", " << ie->x << ", " << ie->y << endl;
// Range check and convert the position
- boost::shared_array<int> coords =
+ std::unique_ptr<int[]> coords =
MouseDevice::convertCoordinates(ie->x, ie->y, 1024,
768);
cerr << "X = " << coords[0] << endl;
cerr << "Y = " << coords[1] << endl;
http://git.savannah.gnu.org/cgit//commit/?id=6cccede8e878cc9d3fbc2cbfad2d97fef5a09178
commit 6cccede8e878cc9d3fbc2cbfad2d97fef5a09178
Author: Bastiaan Jacques <address@hidden>
Date: Tue May 20 21:30:05 2014 +0200
Remove unused includes.
diff --git a/cygnal/cgi-bin/echo/echo.h b/cygnal/cgi-bin/echo/echo.h
index 88020c3..1ee4d06 100644
--- a/cygnal/cgi-bin/echo/echo.h
+++ b/cygnal/cgi-bin/echo/echo.h
@@ -20,7 +20,6 @@
#define _ECHO_H_
#include <vector>
-#include <boost/shared_array.hpp>
#include <sstream>
// gnash headers
diff --git a/cygnal/cgi-bin/echo/gateway.h b/cygnal/cgi-bin/echo/gateway.h
index f2f9d48..d4744ae 100644
--- a/cygnal/cgi-bin/echo/gateway.h
+++ b/cygnal/cgi-bin/echo/gateway.h
@@ -21,7 +21,6 @@
#include <string>
#include <vector>
-#include <boost/shared_array.hpp>
#include <sstream>
#include "amf.h"
diff --git a/cygnal/cgi-bin/fitcDemo/fitcDemo.h
b/cygnal/cgi-bin/fitcDemo/fitcDemo.h
index a0678eb..2862300 100644
--- a/cygnal/cgi-bin/fitcDemo/fitcDemo.h
+++ b/cygnal/cgi-bin/fitcDemo/fitcDemo.h
@@ -20,7 +20,6 @@
#define _FITCDEMO_H_
#include <vector>
-#include <boost/shared_array.hpp>
#include <sstream>
// gnash headers
diff --git a/cygnal/cgi-bin/oflaDemo/oflaDemo.h
b/cygnal/cgi-bin/oflaDemo/oflaDemo.h
index 31830c4..825b926 100644
--- a/cygnal/cgi-bin/oflaDemo/oflaDemo.h
+++ b/cygnal/cgi-bin/oflaDemo/oflaDemo.h
@@ -21,7 +21,6 @@
#include <string>
#include <vector>
-#include <boost/shared_array.hpp>
#include <sstream>
// gnash headers
diff --git a/cygnal/handler.cpp b/cygnal/handler.cpp
index 2745658..c6cc416 100644
--- a/cygnal/handler.cpp
+++ b/cygnal/handler.cpp
@@ -22,7 +22,6 @@
#include <boost/thread/thread.hpp>
#include <boost/thread/mutex.hpp>
-#include <boost/shared_array.hpp>
#include <memory>
#include <functional>
#include <algorithm>
diff --git a/cygnal/handler.h b/cygnal/handler.h
index 8d7fb66..96f76e4 100644
--- a/cygnal/handler.h
+++ b/cygnal/handler.h
@@ -22,7 +22,6 @@
#include <map>
#include <boost/cstdint.hpp>
#include <boost/thread/mutex.hpp>
-#include <boost/shared_array.hpp>
#include <memory>
//#include <boost/thread/condition.hpp>
diff --git a/cygnal/http_server.cpp b/cygnal/http_server.cpp
index c35dd39..fb4e69c 100644
--- a/cygnal/http_server.cpp
+++ b/cygnal/http_server.cpp
@@ -23,7 +23,6 @@
#endif
#include <boost/thread/mutex.hpp>
-#include <boost/shared_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 2b5ebcc..3884604 100644
--- a/cygnal/http_server.h
+++ b/cygnal/http_server.h
@@ -22,7 +22,6 @@
#include <string>
#include <vector>
-#include <boost/shared_array.hpp>
#include <sstream>
#include "amf.h"
diff --git a/cygnal/libnet/cache.cpp b/cygnal/libnet/cache.cpp
index 307be35..83ffd0d 100644
--- a/cygnal/libnet/cache.cpp
+++ b/cygnal/libnet/cache.cpp
@@ -23,7 +23,6 @@
#endif
#include <boost/thread/mutex.hpp>
-#include <boost/shared_array.hpp>
#include <sys/types.h>
#include <sys/stat.h>
#include <string>
diff --git a/cygnal/libnet/http.cpp b/cygnal/libnet/http.cpp
index 22d9b77..19b7e5d 100644
--- a/cygnal/libnet/http.cpp
+++ b/cygnal/libnet/http.cpp
@@ -19,7 +19,6 @@
//
#include <boost/thread/mutex.hpp>
-#include <boost/shared_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 ebe32f6..136be24 100644
--- a/cygnal/libnet/http.h
+++ b/cygnal/libnet/http.h
@@ -23,7 +23,6 @@
#include <string>
#include <map>
#include <vector>
-#include <boost/shared_array.hpp>
#include <sstream>
#ifdef HAVE_CONFIG_H
diff --git a/cygnal/libnet/sshclient.cpp b/cygnal/libnet/sshclient.cpp
index be04c9e..be2d91c 100644
--- a/cygnal/libnet/sshclient.cpp
+++ b/cygnal/libnet/sshclient.cpp
@@ -18,7 +18,6 @@
//
#include <boost/thread/mutex.hpp>
-#include <boost/shared_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 4765e68..db572c1 100644
--- a/cygnal/libnet/sshclient.h
+++ b/cygnal/libnet/sshclient.h
@@ -21,7 +21,6 @@
#include <string>
#include <boost/array.hpp>
-#include <boost/shared_array.hpp>
#include <boost/cstdint.hpp>
#include <sstream>
diff --git a/cygnal/libnet/sshserver.cpp b/cygnal/libnet/sshserver.cpp
index 2ee0ef1..964625d 100644
--- a/cygnal/libnet/sshserver.cpp
+++ b/cygnal/libnet/sshserver.cpp
@@ -18,7 +18,6 @@
//
#include <boost/thread/mutex.hpp>
-#include <boost/shared_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 7955e06..4741e12 100644
--- a/cygnal/libnet/sshserver.h
+++ b/cygnal/libnet/sshserver.h
@@ -21,7 +21,6 @@
#include <string>
#include <boost/array.hpp>
-#include <boost/shared_array.hpp>
#include <boost/cstdint.hpp>
#include <sstream>
diff --git a/cygnal/libnet/sslclient.cpp b/cygnal/libnet/sslclient.cpp
index cec097b..eee05c2 100644
--- a/cygnal/libnet/sslclient.cpp
+++ b/cygnal/libnet/sslclient.cpp
@@ -22,7 +22,6 @@
#endif
#include <boost/thread/mutex.hpp>
-#include <boost/shared_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 55029f9..12b7fa7 100644
--- a/cygnal/libnet/sslclient.h
+++ b/cygnal/libnet/sslclient.h
@@ -25,7 +25,6 @@
#include <string>
#include <boost/array.hpp>
-#include <boost/shared_array.hpp>
#include <boost/cstdint.hpp>
#include <sstream>
diff --git a/cygnal/libnet/sslserver.cpp b/cygnal/libnet/sslserver.cpp
index 05bd69f..6fe9c35 100644
--- a/cygnal/libnet/sslserver.cpp
+++ b/cygnal/libnet/sslserver.cpp
@@ -22,7 +22,6 @@
#endif
#include <boost/thread/mutex.hpp>
-#include <boost/shared_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 b5cd371..5bb98ac 100644
--- a/cygnal/libnet/sslserver.h
+++ b/cygnal/libnet/sslserver.h
@@ -24,7 +24,6 @@
#endif
#include <boost/array.hpp>
-#include <boost/shared_array.hpp>
#include <boost/cstdint.hpp>
#include <sstream>
diff --git a/libcore/swf/DefineVideoStreamTag.cpp
b/libcore/swf/DefineVideoStreamTag.cpp
index 237d2f5..610848c 100644
--- a/libcore/swf/DefineVideoStreamTag.cpp
+++ b/libcore/swf/DefineVideoStreamTag.cpp
@@ -18,7 +18,6 @@
#include "DefineVideoStreamTag.h"
-#include <boost/shared_array.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <memory>
diff --git a/libcore/swf/DefineVideoStreamTag.h
b/libcore/swf/DefineVideoStreamTag.h
index 4074937..389fe3f 100644
--- a/libcore/swf/DefineVideoStreamTag.h
+++ b/libcore/swf/DefineVideoStreamTag.h
@@ -19,7 +19,6 @@
#ifndef GNASH_SWF_DEFINEVIDEOSTREAMTAG_H
#define GNASH_SWF_DEFINEVIDEOSTREAMTAG_H
-#include <boost/shared_array.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <memory>
diff --git a/librender/Renderer.h b/librender/Renderer.h
index 7658001..097c0be 100644
--- a/librender/Renderer.h
+++ b/librender/Renderer.h
@@ -146,8 +146,6 @@
#include "dsodefs.h" // for DSOEXPORT
-#include "boost/shared_array.hpp"
-#include "boost/scoped_ptr.hpp"
#include "GnashEnums.h"
#include "Range2d.h"
#include "Point2d.h"
http://git.savannah.gnu.org/cgit//commit/?id=d6f6432653bc4e1814a23f42e1edca00ae080483
commit d6f6432653bc4e1814a23f42e1edca00ae080483
Author: Bastiaan Jacques <address@hidden>
Date: Tue May 20 21:21:36 2014 +0200
Replace boost::function with std::function.
diff --git a/gui/gui.h b/gui/gui.h
index dc23ef1..efa7241 100644
--- a/gui/gui.h
+++ b/gui/gui.h
@@ -28,6 +28,7 @@
#include <string>
#include <map>
#include <utility>
+#include <functional>
#include "snappingrange.h" // for InvalidatedRanges
#include "GnashKey.h"
@@ -536,7 +537,7 @@ private:
struct Display;
- std::map<int /* fd */, boost::function<void ()> > _fd_callbacks;
+ std::map<int /* fd */, std::function<void ()> > _fd_callbacks;
/// Width of a window pixel, in stage pseudopixel units.
float _xscale;
diff --git a/libbase/accumulator.h b/libbase/accumulator.h
index 532bf32..694cbd2 100644
--- a/libbase/accumulator.h
+++ b/libbase/accumulator.h
@@ -22,7 +22,7 @@
#include <boost/program_options/value_semantic.hpp>
#include <boost/any.hpp>
-#include <boost/function.hpp>
+#include <functional>
#include <vector>
#include <string>
@@ -35,7 +35,7 @@ public:
accumulator_type() : _interval(1), _default(0) {}
/// Set the notifier function.
- accumulator_type* notifier(boost::function1<void, const T&> f) {
+ accumulator_type* notifier(std::function<void(const T&)> f) {
_notifier = f;
return this;
}
@@ -93,7 +93,7 @@ public:
virtual ~accumulator_type() {}
private:
- boost::function1<void, const T&> _notifier;
+ std::function<void(const T&)> _notifier;
T _interval;
T _default;
};
diff --git a/libcore/asobj/Array_as.cpp b/libcore/asobj/Array_as.cpp
index 5c6136a..7519427 100644
--- a/libcore/asobj/Array_as.cpp
+++ b/libcore/asobj/Array_as.cpp
@@ -23,6 +23,7 @@
#include <string>
#include <algorithm>
#include <cmath>
+#include <functional>
#include <boost/algorithm/string/case_conv.hpp>
#include <boost/lexical_cast.hpp>
@@ -63,7 +64,7 @@ namespace {
struct indexed_as_value;
- typedef boost::function2<bool, const as_value&, const as_value&> as_cmp_fn;
+ typedef std::function<bool(const as_value&, const as_value&)> as_cmp_fn;
void attachArrayInterface(as_object& proto);
void attachArrayStatics(as_object& proto);
http://git.savannah.gnu.org/cgit//commit/?id=dbc093032b13e8af2819e8eec6da87a05feb20b8
commit dbc093032b13e8af2819e8eec6da87a05feb20b8
Author: Bastiaan Jacques <address@hidden>
Date: Tue May 20 21:21:09 2014 +0200
Drop unused code.
diff --git a/libcore/SWFStream.cpp b/libcore/SWFStream.cpp
index e7b6890..9f9a97c 100644
--- a/libcore/SWFStream.cpp
+++ b/libcore/SWFStream.cpp
@@ -238,13 +238,6 @@ float SWFStream::read_short_sfixed()
return read_s16() / 256.0f;
}
-/// Read a 16bit (1:sign 5:exp 10:mantissa) floating point value
-float SWFStream::read_short_float()
-{
- // read_s16 will align
- return static_cast<float> ( read_s16() );
-}
-
// Read a little-endian 32-bit float from p
// and return it as a host-endian float.
static float
diff --git a/libcore/SWFStream.h b/libcore/SWFStream.h
index a89eb6c..d35801b 100644
--- a/libcore/SWFStream.h
+++ b/libcore/SWFStream.h
@@ -111,12 +111,6 @@ public:
///
float read_short_sfixed();
- /// Read a 16bit (1:sign 5:exp 10:mantissa) floating point value
- //
- /// aligned read
- ///
- float read_short_float();
-
/// Read a 32bit (1:sign 8:exp 23:mantissa) floating point value
//
/// aligned read
diff --git a/libcore/swf/DefineVideoStreamTag.h
b/libcore/swf/DefineVideoStreamTag.h
index c8011b0..4074937 100644
--- a/libcore/swf/DefineVideoStreamTag.h
+++ b/libcore/swf/DefineVideoStreamTag.h
@@ -39,29 +39,6 @@ namespace gnash {
namespace gnash {
-/// Class used to store data for the undecoded embedded video frames.
-/// Contains the data, the data size and the type of the frame
-class VideoData
-{
-public:
- VideoData(boost::shared_array<boost::uint8_t> data, boost::uint32_t
size,
- media::videoFrameType ft)
- :
- videoData(data),
- dataSize(size),
- frameType(ft)
- {
- }
-
- ~VideoData()
- {
- }
-
- boost::shared_array<boost::uint8_t> videoData;
- boost::uint32_t dataSize;
- media::videoFrameType frameType;
-};
-
namespace SWF {
class DefineVideoStreamTag : public DefinitionTag
http://git.savannah.gnu.org/cgit//commit/?id=e968e2edd32478264cb1ade0949b8fb0497a7e0f
commit e968e2edd32478264cb1ade0949b8fb0497a7e0f
Author: Bastiaan Jacques <address@hidden>
Date: Tue May 20 21:19:43 2014 +0200
Keep the enable_if as a parameter to retain compatibility with old
compilers.
diff --git a/libbase/GnashFactory.h b/libbase/GnashFactory.h
index 5624529..378423f 100644
--- a/libbase/GnashFactory.h
+++ b/libbase/GnashFactory.h
@@ -83,11 +83,11 @@ public:
/// Dump the registered keys to the iterator.
//
/// Only usable with output iterators.
- template<typename Iterator, typename std::enable_if<
- std::is_same<typename
std::iterator_traits<Iterator>::iterator_category,
- std::output_iterator_tag>::value>::type = 0>
+ template<typename Iterator>
void
- listKeys(Iterator i) {
+ listKeys(Iterator i, typename std::enable_if<
+ std::is_same<typename
std::iterator_traits<Iterator>::iterator_category,
+ std::output_iterator_tag>::value>::type* = 0) {
Init();
std::transform(_handlers.begin(), _handlers.end(), i,
std::bind(&Handlers::value_type::first,
std::placeholders::_1));
http://git.savannah.gnu.org/cgit//commit/?id=cb90d701eb0ce1da20e4860789a3376c44dad7bd
commit cb90d701eb0ce1da20e4860789a3376c44dad7bd
Author: Bastiaan Jacques <address@hidden>
Date: Tue May 20 17:39:33 2014 +0200
Use enable_if and type traits from the standard library.
diff --git a/libbase/GnashFactory.h b/libbase/GnashFactory.h
index 4be37da..5624529 100644
--- a/libbase/GnashFactory.h
+++ b/libbase/GnashFactory.h
@@ -29,8 +29,7 @@
#include <string>
#include <algorithm>
#include <iterator>
-#include <boost/type_traits.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <type_traits>
#include "dsodefs.h"
#include "GnashAlgorithm.h"
@@ -84,12 +83,12 @@ public:
/// Dump the registered keys to the iterator.
//
/// Only usable with output iterators.
- template<typename Iterator>
- void listKeys(Iterator i, typename boost::enable_if<boost::is_same<
- typename std::iterator_traits<Iterator>::iterator_category,
- std::output_iterator_tag> >::type* dummy = 0) {
+ template<typename Iterator, typename std::enable_if<
+ std::is_same<typename
std::iterator_traits<Iterator>::iterator_category,
+ std::output_iterator_tag>::value>::type = 0>
+ void
+ listKeys(Iterator i) {
Init();
- static_cast<void>(dummy);
std::transform(_handlers.begin(), _handlers.end(), i,
std::bind(&Handlers::value_type::first,
std::placeholders::_1));
}
diff --git a/libbase/GnashNumeric.h b/libbase/GnashNumeric.h
index c92a2bd..fec31f2 100644
--- a/libbase/GnashNumeric.h
+++ b/libbase/GnashNumeric.h
@@ -34,8 +34,7 @@
#include <algorithm>
#include <boost/cstdint.hpp>
#include <limits>
-#include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_floating_point.hpp>
+#include <type_traits>
namespace gnash {
@@ -59,7 +58,7 @@ isFinite(double d)
template <typename T>
inline
-typename boost::enable_if<boost::is_floating_point<T>, bool>::type
+typename std::enable_if<std::is_floating_point<T>::value, bool>::type
isNaN(const T& num)
{
return num != num;
diff --git a/libcore/as_value.h b/libcore/as_value.h
index 0adc302..be7a0f1 100644
--- a/libcore/as_value.h
+++ b/libcore/as_value.h
@@ -23,7 +23,7 @@
#include <string>
#include <boost/variant.hpp>
#include <iosfwd> // for inlined output operator
-#include <boost/utility/enable_if.hpp>
+#include <type_traits>
#include <boost/cstdint.hpp>
#include "utility.h" // for UNUSED
@@ -150,7 +150,7 @@ public:
/// Construct a primitive Boolean value
template <typename T>
- as_value(T val, typename boost::enable_if<boost::is_same<bool, T> >::type*
+ as_value(T val, typename std::enable_if<boost::is_same<bool,
T>::value>::type*
dummy = 0)
:
_type(BOOLEAN),
-----------------------------------------------------------------------
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.h | 1 -
cygnal/handler.cpp | 1 -
cygnal/handler.h | 2 --
cygnal/http_server.cpp | 1 -
cygnal/http_server.h | 1 -
cygnal/libnet/cache.cpp | 1 -
cygnal/libnet/http.cpp | 1 -
cygnal/libnet/http.h | 1 -
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 | 1 -
cygnal/libnet/sslserver.cpp | 1 -
cygnal/libnet/sslserver.h | 1 -
gui/fb/fb.cpp | 2 +-
gui/fb/fb_glue_ovg.cpp | 2 +-
gui/gtk/gtk_glue_ovg.cpp | 2 +-
gui/gui.h | 3 ++-
libbase/GnashFactory.h | 11 +++++------
libbase/GnashNumeric.h | 5 ++---
libbase/accumulator.h | 6 +++---
libcore/SWFStream.cpp | 7 -------
libcore/SWFStream.h | 6 ------
libcore/as_value.h | 4 ++--
libcore/asobj/Array_as.cpp | 3 ++-
libcore/swf/DefineVideoStreamTag.cpp | 1 -
libcore/swf/DefineVideoStreamTag.h | 24 ------------------------
libdevice/DeviceGlue.h | 5 ++---
libdevice/events/EventDevice.cpp | 2 +-
libdevice/events/InputDevice.cpp | 8 ++++----
libdevice/events/InputDevice.h | 5 ++---
libdevice/events/MouseDevice.cpp | 5 ++---
libdevice/events/TouchDevice.cpp | 2 +-
libdevice/events/UinputDevice.cpp | 1 -
librender/Renderer.h | 2 --
librender/testr.cpp | 2 +-
testsuite/libdevice.all/test_events.cpp | 2 +-
42 files changed, 33 insertions(+), 97 deletions(-)
hooks/post-receive
--
Gnash
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2034-gba743ab,
Bastiaan Jacques <=