tags 455281 + patch thanks Hi!
Please find attached a patch to fix the FTBFS with g++ 4.3. The patch also includes Peter Green's patch to prevent the FTBFS. HTH. Kumar -- Kumar Appaiah, 458, Jamuna Hostel, Indian Institute of Technology Madras, Chennai - 600 036
--- beast-0.7.1.orig/bse/tests/resamplehandle.cc
+++ beast-0.7.1/bse/tests/resamplehandle.cc
@@ -24,6 +24,7 @@
#include <bse/gsldatautils.h>
#include <bse/bseblockutils.hh>
#include <vector>
+#include <cstdlib>
using std::vector;
using std::max;
only in patch2:
unchanged:
--- beast-0.7.1.orig/bse/tests/firhandle.cc
+++ beast-0.7.1/bse/tests/firhandle.cc
@@ -26,6 +26,7 @@
#include <math.h>
#include <complex>
#include <vector>
+#include <cstdlib>
using std::vector;
using std::min;
only in patch2:
unchanged:
--- beast-0.7.1.orig/bse/tests/filtertest.cc
+++ beast-0.7.1/bse/tests/filtertest.cc
@@ -26,6 +26,7 @@
#include "topconfig.h"
#include <math.h>
#include <complex>
+#include <cstdlib>
typedef std::complex<double> Complex;
using namespace Birnet;
only in patch2:
unchanged:
--- beast-0.7.1.orig/bse/bseresamplerimpl.hh
+++ beast-0.7.1/bse/bseresamplerimpl.hh
@@ -23,6 +23,8 @@
#include <bse/bseresampler.hh>
#include <birnet/birnet.hh>
#include <math.h>
+#include <cstring>
+#include <cstdlib>
#ifdef __SSE__
#include <xmmintrin.h>
#endif
only in patch2:
unchanged:
--- beast-0.7.1.orig/bse/bseprocidl.cc
+++ beast-0.7.1/bse/bseprocidl.cc
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <string>
#include <set>
+#include <cstring>
std::set<std::string> needTypes;
std::set<std::string> needClasses;
only in patch2:
unchanged:
--- beast-0.7.1.orig/bse/bsecxxplugin.hh
+++ beast-0.7.1/bse/bsecxxplugin.hh
@@ -56,7 +56,7 @@
#define BSE_CXX_REGISTER_STATIC_HOOK(HookType) BSE_CXX_REGISTER_HOOK_NODE (HookType, 1)
#define BSE_CXX_REGISTER_HOOK_NODE(HookType, __static) \
template<class E> static BseExportNode* bse_export_node (); \
- template<> static BseExportNode* \
+ template<> BseExportNode* \
bse_export_node<HookType> () \
{ \
static BseExportNodeHook hnode = { \
@@ -91,7 +91,7 @@
(::NameSpace::bse_type_keeper__3##EnumType.get_type ())
#define BSE_CXX_DECLARE_ENUM(EnumType,EnumName,N,ICode) \
template<class E> static BseExportNode* bse_export_node (); \
- template<> static BseExportNode* \
+ template<> BseExportNode* \
bse_export_node<EnumType> () \
{ \
static BseExportNodeEnum enode = { \
@@ -145,7 +145,7 @@
(::NameSpace::bse_type_keeper__1##RecordType.get_type ())
#define BSE_CXX_DECLARE_RECORD(RecordType) \
template<class E> static BseExportNode* bse_export_node (); \
- template<> static BseExportNode* \
+ template<> BseExportNode* \
bse_export_node<RecordType> () \
{ \
static BseExportNodeBoxed bnode = { \
@@ -181,7 +181,7 @@
(::NameSpace::bse_type_keeper__2##SequenceType.get_type ())
#define BSE_CXX_DECLARE_SEQUENCE(SequenceType) \
template<class E> static BseExportNode* bse_export_node (); \
- template<> static BseExportNode* \
+ template<> BseExportNode* \
bse_export_node<SequenceType> () \
{ \
static BseExportNodeBoxed bnode = { \
@@ -219,7 +219,7 @@
extern ::Bse::ExportTypeKeeper bse_type_keeper__9##ProcType;
#define BSE_CXX_REGISTER_PROCEDURE(ProcType) \
template<class C> static ::BseExportNode* bse_export_node (); \
- template<> static ::BseExportNode* \
+ template<> ::BseExportNode* \
bse_export_node<Procedure::ProcType> () \
{ \
static ::BseExportNodeProc pnode = { \
@@ -259,7 +259,7 @@
#define BSE_CXX_REGISTER_EFFECT(Effect) \
BSE_CXX_DEFINE_STATIC_DATA (Effect##Base); \
template<class C> static ::BseExportNode* bse_export_node (); \
- template<> static ::BseExportNode* \
+ template<> ::BseExportNode* \
bse_export_node<Effect> () \
{ \
static ::BseExportNodeClass cnode = { \
only in patch2:
unchanged:
--- beast-0.7.1.orig/bse/Makefile.in
+++ beast-0.7.1/bse/Makefile.in
@@ -422,7 +422,7 @@
# need -I$(srcdir) for "bseserver.h" in .genprc.c
# need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc
INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. \
- $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS
+ $(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS
EXTRA_HEADERS =
MAINTAINERCLEANFILES = $(GENERATED) $(am__append_2)
# -Wl,-Bsymbolic
only in patch2:
unchanged:
--- beast-0.7.1.orig/bse/bseloader-guspatch.cc
+++ beast-0.7.1/bse/bseloader-guspatch.cc
@@ -22,6 +22,7 @@
#include <errno.h>
#include <vector>
#include <string>
+#include <cstring>
#undef WITH_GUSPATCH_XINFOS
static SFI_MSG_TYPE_DEFINE (debug_guspatch, "guspatch", SFI_MSG_DEBUG, NULL);
only in patch2:
unchanged:
--- beast-0.7.1.orig/bse/bsesequencer.cc
+++ beast-0.7.1/bse/bsesequencer.cc
@@ -30,6 +30,7 @@
#include <fcntl.h>
#include <errno.h>
#include <vector>
+#include <cstring>
/* due to a linker/compiler bug on SuSE 9.2, we need to
* define extern "C" symbols outside of any C++ namespace,
only in patch2:
unchanged:
--- beast-0.7.1.orig/sfi/sfidl-cxxbase.cc
+++ beast-0.7.1/sfi/sfidl-cxxbase.cc
@@ -23,6 +23,7 @@
#include <unistd.h>
#include <errno.h>
#include <ctype.h>
+#include <cstring>
#include "sfidl-namespace.hh"
#include "sfidl-options.hh"
#include "sfidl-parser.hh"
only in patch2:
unchanged:
--- beast-0.7.1.orig/sfi/sfidl-namespace.cc
+++ beast-0.7.1/sfi/sfidl-namespace.cc
@@ -21,6 +21,7 @@
#include <list>
#include <string>
#include <map>
+#include <algorithm>
#include "sfidl-namespace.hh"
#include <sfi/glib-extra.h>
only in patch2:
unchanged:
--- beast-0.7.1.orig/sfi/sfidl-options.cc
+++ beast-0.7.1/sfi/sfidl-options.cc
@@ -22,6 +22,7 @@
#include "topconfig.h"
#include <sfi/glib-extra.h>
#include <stdio.h>
+#include <cstring>
/* FIXME: should be filled out and written into topconfig.h by configure */
#define SFIDL_VERSION BST_VERSION
only in patch2:
unchanged:
--- beast-0.7.1.orig/sfi/sficxx.hh
+++ beast-0.7.1/sfi/sficxx.hh
@@ -23,6 +23,7 @@
#include <sfi/sfi.h>
#include <string>
#include <new>
+#include <cstring>
namespace Sfi {
only in patch2:
unchanged:
--- beast-0.7.1.orig/sfi/sfidl-factory.cc
+++ beast-0.7.1/sfi/sfidl-factory.cc
@@ -18,6 +18,7 @@
*/
#include "sfidl-factory.hh"
#include "glib-extra.h"
+#include <algorithm>
using namespace Sfidl;
using namespace std;
only in patch2:
unchanged:
--- beast-0.7.1.orig/sfi/sfidl-parser.cc
+++ beast-0.7.1/sfi/sfidl-parser.cc
@@ -27,6 +27,9 @@
#include <iostream>
#include <set>
#include <stack>
+#include <cstring>
+#include <cstdlib>
+#include <algorithm>
const std::string
Sfidl::string_from_int (long long int lli)
only in patch2:
unchanged:
--- beast-0.7.1.orig/tests/bse/filtertest.cc
+++ beast-0.7.1/tests/bse/filtertest.cc
@@ -28,6 +28,7 @@
#include <birnet/birnettests.h>
#include "topconfig.h"
#include <errno.h>
+#include <cstdlib>
using std::string;
using std::vector;
only in patch2:
unchanged:
--- beast-0.7.1.orig/tools/bsewavetool.cc
+++ beast-0.7.1/tools/bsewavetool.cc
@@ -34,6 +34,7 @@
#include <fcntl.h>
#include <vector>
#include <map>
+#include <algorithm>
namespace BseWaveTool {
only in patch2:
unchanged:
--- beast-0.7.1.orig/tools/bsefcompare.cc
+++ beast-0.7.1/tools/bsefcompare.cc
@@ -28,6 +28,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <cstring>
#include "topconfig.h"
only in patch2:
unchanged:
--- beast-0.7.1.orig/tools/bsefextract.cc
+++ beast-0.7.1/tools/bsefextract.cc
@@ -27,6 +27,8 @@
#include <errno.h>
#include <assert.h>
#include "topconfig.h"
+#include <cstring>
+#include <cstdlib>
#include <map>
#include <string>
only in patch2:
unchanged:
--- beast-0.7.1.orig/birnet/tests/sorting.cc
+++ beast-0.7.1/birnet/tests/sorting.cc
@@ -19,6 +19,8 @@
// #define TEST_VERBOSE
#include <birnet/birnettests.h>
#include <math.h>
+#include <cstdlib>
+#include <algorithm>
namespace {
using namespace Birnet;
only in patch2:
unchanged:
--- beast-0.7.1.orig/birnet/tests/strings.cc
+++ beast-0.7.1/birnet/tests/strings.cc
@@ -18,6 +18,7 @@
*/
//#define TEST_VERBOSE
#include <birnet/birnettests.h>
+#include <cstdlib>
using namespace Birnet;
namespace {
only in patch2:
unchanged:
--- beast-0.7.1.orig/birnet/tests/threads.cc
+++ beast-0.7.1/birnet/tests/threads.cc
@@ -18,6 +18,7 @@
*/
//#define TEST_VERBOSE
#include <birnet/birnettests.h>
+#include <cstdlib>
namespace {
using namespace Birnet;
only in patch2:
unchanged:
--- beast-0.7.1.orig/birnet/birnetutils.cc
+++ beast-0.7.1/birnet/birnetutils.cc
@@ -31,6 +31,7 @@
#include <algorithm>
#include <cxxabi.h>
#include <signal.h>
+#include <cstring>
#ifndef _
#define _(s) s
only in patch2:
unchanged:
--- beast-0.7.1.orig/birnet/birnetsignal.hh
+++ beast-0.7.1/birnet/birnetsignal.hh
@@ -435,7 +435,7 @@
/* --- predefined signals --- */
template<class Emitter>
struct SignalFinalize : Signal0 <Emitter, void, ScopeReferenceFinalizationMark> {
- typedef Signal0<Emitter, void, ScopeReferenceFinalizationMark> Signal0;
+ typedef Birnet::Signals::Signal0<Emitter, void, ScopeReferenceFinalizationMark> Signal0;
explicit SignalFinalize (Emitter &emitter) : Signal0 (emitter) {}
explicit SignalFinalize (Emitter &emitter, void (Emitter::*method) ()) : Signal0 (emitter, method) {}
BIRNET_PRIVATE_CLASS_COPY (SignalFinalize);
@@ -443,7 +443,7 @@
template<class Emitter>
struct SignalVoid : Signal0 <Emitter, void> {
- typedef Signal0<Emitter, void> Signal0;
+ typedef Birnet::Signals::Signal0<Emitter, void> Signal0;
explicit SignalVoid (Emitter &emitter) : Signal0 (emitter) {}
explicit SignalVoid (Emitter &emitter, void (Emitter::*method) (void)) : Signal0 (emitter, method) {}
BIRNET_PRIVATE_CLASS_COPY (SignalVoid);
only in patch2:
unchanged:
--- beast-0.7.1.orig/birnet/birnetmsg.cc
+++ beast-0.7.1/birnet/birnetmsg.cc
@@ -21,6 +21,7 @@
#include "birnetthread.hh"
#include <syslog.h>
#include <errno.h>
+#include <cstring>
#ifndef _ // FIXME
#define _(x) (x)
only in patch2:
unchanged:
--- beast-0.7.1.orig/birnet/birnetsignaltemplate.hh
+++ beast-0.7.1/birnet/birnetsignaltemplate.hh
@@ -165,7 +165,7 @@
template<class Emitter, typename R0, typename A1, typename A2, typename A3, class Collector>
struct Signal<Emitter, R0 (A1, A2, A3), Collector> : Signal3<Emitter, R0, A1, A2, A3, Collector>
{
- typedef Signal3<Emitter, R0, A1, A2, A3, Collector> Signal3;
+ typedef Birnet::Signals::Signal3<Emitter, R0, A1, A2, A3, Collector> Signal3;
explicit Signal (Emitter &emitter) :
Signal3 (emitter)
{}
signature.asc
Description: Digital signature
