[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: |
Markus Gothe |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1906-g0490403 |
Date: |
Mon, 21 Apr 2014 21:54:46 +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 04904035ed64556cae836fcb6279eefc66dff152 (commit)
via 9b5bb9db5717dc0316ae69dbe0bab84124abf002 (commit)
via 0c3c867b5b124eeaa21217d2e14bbf6d2fbd7aed (commit)
from 4b40aebeb2244895197adfe6d76514d6b3ab6f51 (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=04904035ed64556cae836fcb6279eefc66dff152
commit 04904035ed64556cae836fcb6279eefc66dff152
Author: Markus Gothe <address@hidden>
Date: Mon Apr 21 23:51:58 2014 +0200
The new C++ introducing shared_ptr can not be distinguished from this one
from boost. Type its namespace hard.
diff --git a/testsuite/libcore.all/ClassSizes.cpp
b/testsuite/libcore.all/ClassSizes.cpp
index f86fe28..94f12ab 100644
--- a/testsuite/libcore.all/ClassSizes.cpp
+++ b/testsuite/libcore.all/ClassSizes.cpp
@@ -74,7 +74,7 @@ using namespace gnash::SWF;
#define TYPES \
(int) (float) (long) (double) \
(Property*) (auto_ptr<Property>) (scoped_ptr<Property>) \
-(shared_ptr<Property>) (intrusive_ptr<as_object>) (GcResource) \
+(boost::shared_ptr<Property>) (intrusive_ptr<as_object>) (GcResource) \
(rgba) (SWFMatrix) (SWFRect) (LineStyle) (FillStyle) (SWFCxForm) \
(as_value) \
(DynamicShape)(ShapeRecord)(TextRecord) \
http://git.savannah.gnu.org/cgit//commit/?id=9b5bb9db5717dc0316ae69dbe0bab84124abf002
commit 9b5bb9db5717dc0316ae69dbe0bab84124abf002
Author: Markus Gothe <address@hidden>
Date: Mon Apr 21 23:48:04 2014 +0200
Change from <iostream> to more lightweight <ios> on baastian's suggestion.
diff --git a/libbase/IOChannel.h b/libbase/IOChannel.h
index b12e62b..efb61ff 100644
--- a/libbase/IOChannel.h
+++ b/libbase/IOChannel.h
@@ -22,7 +22,7 @@
#define GNASH_IOCHANNEL_H
#include <string>
-#include <iostream> // for std::streamsize
+#include <ios> // for std::streamsize
#include <boost/cstdint.hpp> // for boost int types
#include "dsodefs.h" // DSOEXPORT
http://git.savannah.gnu.org/cgit//commit/?id=0c3c867b5b124eeaa21217d2e14bbf6d2fbd7aed
commit 0c3c867b5b124eeaa21217d2e14bbf6d2fbd7aed
Author: Markus Gothe <address@hidden>
Date: Mon Apr 21 23:40:50 2014 +0200
Avoid having hard-coded -lboost_system... Me myself use lboost_system-mt.
diff --git a/testsuite/libbase.all/Makefile.am
b/testsuite/libbase.all/Makefile.am
index 911f7ff..de3eb2f 100644
--- a/testsuite/libbase.all/Makefile.am
+++ b/testsuite/libbase.all/Makefile.am
@@ -22,6 +22,8 @@ AUTOMAKE_OPTIONS = dejagnu
LDADD = \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/librender/libgnashrender.la \
+ $(CROSS_LDFLAGS) \
+ $(BOOST_LIBS) \
$(LIBINTL) \
$(AGG_LIBS) \
$(OPENVG_LIBS) \
@@ -83,12 +85,12 @@ NoSeekFileTest_LDADD = $(LDADD)
URLTest_SOURCES = URLTest.cpp
URLTest_CPPFLAGS = $(AM_CPPFLAGS) \
'-DBUILDDIR="$(abs_builddir)"'
-URLTest_LDADD = $(LDADD) -lboost_system
+URLTest_LDADD = $(LDADD)
RcTest_SOURCES = RcTest.cpp
RcTest_CPPFLAGS = $(AM_CPPFLAGS) \
-DSRCDIR="$(srcdir)"
-RcTest_LDADD = $(LDADD) -lboost_system
+RcTest_LDADD = $(LDADD)
IntTypesTest_SOURCES = IntTypesTest.cpp
IntTypesTest_CPPFLAGS = $(AM_CPPFLAGS) \
-----------------------------------------------------------------------
Summary of changes:
libbase/IOChannel.h | 2 +-
testsuite/libbase.all/Makefile.am | 6 ++++--
testsuite/libcore.all/ClassSizes.cpp | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1906-g0490403,
Markus Gothe <=