| 1 |
loki_val 08/12/04 23:47:22 |
| 2 |
|
| 3 |
Modified: beast-0.7.1-gcc43.patch |
| 4 |
Log: |
| 5 |
Update gcc-4.3 patch to allow compilation with oldish compilers. Bug 249665. Thanks to Debian and their inexhaustable supply of ready-made patches. |
| 6 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc6 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 media-sound/beast/files/beast-0.7.1-gcc43.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/beast/files/beast-0.7.1-gcc43.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/beast/files/beast-0.7.1-gcc43.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/beast/files/beast-0.7.1-gcc43.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: beast-0.7.1-gcc43.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/beast/files/beast-0.7.1-gcc43.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- beast-0.7.1-gcc43.patch 2 Nov 2008 14:59:31 -0000 1.1 |
| 22 |
+++ beast-0.7.1-gcc43.patch 4 Dec 2008 23:47:22 -0000 1.2 |
| 23 |
@@ -1,5 +1,7 @@ |
| 24 |
---- beast-0.7.1.orig/bse/tests/resamplehandle.cc |
| 25 |
-+++ beast-0.7.1/bse/tests/resamplehandle.cc |
| 26 |
+Index: beast-0.7.1/bse/tests/resamplehandle.cc |
| 27 |
+=================================================================== |
| 28 |
+--- beast-0.7.1.orig/bse/tests/resamplehandle.cc 2006-11-29 01:05:01.000000000 +0000 |
| 29 |
++++ beast-0.7.1/bse/tests/resamplehandle.cc 2008-03-24 14:10:47.000000000 +0000 |
| 30 |
@@ -24,6 +24,7 @@ |
| 31 |
#include <bse/gsldatautils.h> |
| 32 |
#include <bse/bseblockutils.hh> |
| 33 |
@@ -8,10 +10,10 @@ |
| 34 |
|
| 35 |
using std::vector; |
| 36 |
using std::max; |
| 37 |
-only in patch2: |
| 38 |
-unchanged: |
| 39 |
---- beast-0.7.1.orig/bse/tests/firhandle.cc |
| 40 |
-+++ beast-0.7.1/bse/tests/firhandle.cc |
| 41 |
+Index: beast-0.7.1/bse/tests/firhandle.cc |
| 42 |
+=================================================================== |
| 43 |
+--- beast-0.7.1.orig/bse/tests/firhandle.cc 2006-12-10 16:55:16.000000000 +0000 |
| 44 |
++++ beast-0.7.1/bse/tests/firhandle.cc 2008-03-24 14:10:47.000000000 +0000 |
| 45 |
@@ -26,6 +26,7 @@ |
| 46 |
#include <math.h> |
| 47 |
#include <complex> |
| 48 |
@@ -20,10 +22,10 @@ |
| 49 |
|
| 50 |
using std::vector; |
| 51 |
using std::min; |
| 52 |
-only in patch2: |
| 53 |
-unchanged: |
| 54 |
---- beast-0.7.1.orig/bse/tests/filtertest.cc |
| 55 |
-+++ beast-0.7.1/bse/tests/filtertest.cc |
| 56 |
+Index: beast-0.7.1/bse/tests/filtertest.cc |
| 57 |
+=================================================================== |
| 58 |
+--- beast-0.7.1.orig/bse/tests/filtertest.cc 2006-12-11 00:19:16.000000000 +0000 |
| 59 |
++++ beast-0.7.1/bse/tests/filtertest.cc 2008-03-24 14:10:47.000000000 +0000 |
| 60 |
@@ -26,6 +26,7 @@ |
| 61 |
#include "topconfig.h" |
| 62 |
#include <math.h> |
| 63 |
@@ -32,10 +34,10 @@ |
| 64 |
|
| 65 |
typedef std::complex<double> Complex; |
| 66 |
using namespace Birnet; |
| 67 |
-only in patch2: |
| 68 |
-unchanged: |
| 69 |
---- beast-0.7.1.orig/bse/bseresamplerimpl.hh |
| 70 |
-+++ beast-0.7.1/bse/bseresamplerimpl.hh |
| 71 |
+Index: beast-0.7.1/bse/bseresamplerimpl.hh |
| 72 |
+=================================================================== |
| 73 |
+--- beast-0.7.1.orig/bse/bseresamplerimpl.hh 2006-11-25 16:04:33.000000000 +0000 |
| 74 |
++++ beast-0.7.1/bse/bseresamplerimpl.hh 2008-03-24 14:10:47.000000000 +0000 |
| 75 |
@@ -23,6 +23,8 @@ |
| 76 |
#include <bse/bseresampler.hh> |
| 77 |
#include <birnet/birnet.hh> |
| 78 |
@@ -45,10 +47,10 @@ |
| 79 |
#ifdef __SSE__ |
| 80 |
#include <xmmintrin.h> |
| 81 |
#endif |
| 82 |
-only in patch2: |
| 83 |
-unchanged: |
| 84 |
---- beast-0.7.1.orig/bse/bseprocidl.cc |
| 85 |
-+++ beast-0.7.1/bse/bseprocidl.cc |
| 86 |
+Index: beast-0.7.1/bse/bseprocidl.cc |
| 87 |
+=================================================================== |
| 88 |
+--- beast-0.7.1.orig/bse/bseprocidl.cc 2006-11-25 16:04:31.000000000 +0000 |
| 89 |
++++ beast-0.7.1/bse/bseprocidl.cc 2008-03-24 14:10:47.000000000 +0000 |
| 90 |
@@ -24,6 +24,7 @@ |
| 91 |
#include <stdio.h> |
| 92 |
#include <string> |
| 93 |
@@ -57,81 +59,83 @@ |
| 94 |
|
| 95 |
std::set<std::string> needTypes; |
| 96 |
std::set<std::string> needClasses; |
| 97 |
-only in patch2: |
| 98 |
-unchanged: |
| 99 |
---- beast-0.7.1.orig/bse/bsecxxplugin.hh |
| 100 |
-+++ beast-0.7.1/bse/bsecxxplugin.hh |
| 101 |
-@@ -56,7 +56,7 @@ |
| 102 |
+Index: beast-0.7.1/bse/bsecxxplugin.hh |
| 103 |
+=================================================================== |
| 104 |
+--- beast-0.7.1.orig/bse/bsecxxplugin.hh 2006-11-27 00:34:30.000000000 +0000 |
| 105 |
++++ beast-0.7.1/bse/bsecxxplugin.hh 2008-03-24 14:32:56.000000000 +0000 |
| 106 |
+@@ -18,6 +18,14 @@ |
| 107 |
+ #ifndef __BSE_CXX_PLUGIN_H__ |
| 108 |
+ #define __BSE_CXX_PLUGIN_H__ |
| 109 |
+ |
| 110 |
++#define static_template static |
| 111 |
++#if defined __GNUC__ |
| 112 |
++# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) |
| 113 |
++# undef static_template |
| 114 |
++# define static_template |
| 115 |
++# endif |
| 116 |
++#endif |
| 117 |
++ |
| 118 |
+ #include <bse/bsecxxmodule.hh> |
| 119 |
+ #include <bse/bseexports.h> |
| 120 |
+ #include <bse/bseparam.h> |
| 121 |
+@@ -56,7 +64,7 @@ |
| 122 |
#define BSE_CXX_REGISTER_STATIC_HOOK(HookType) BSE_CXX_REGISTER_HOOK_NODE (HookType, 1) |
| 123 |
#define BSE_CXX_REGISTER_HOOK_NODE(HookType, __static) \ |
| 124 |
template<class E> static BseExportNode* bse_export_node (); \ |
| 125 |
- template<> static BseExportNode* \ |
| 126 |
-+ template<> BseExportNode* \ |
| 127 |
++ template<> static_template BseExportNode* \ |
| 128 |
bse_export_node<HookType> () \ |
| 129 |
{ \ |
| 130 |
static BseExportNodeHook hnode = { \ |
| 131 |
-@@ -91,7 +91,7 @@ |
| 132 |
+@@ -91,7 +99,7 @@ |
| 133 |
(::NameSpace::bse_type_keeper__3##EnumType.get_type ()) |
| 134 |
#define BSE_CXX_DECLARE_ENUM(EnumType,EnumName,N,ICode) \ |
| 135 |
template<class E> static BseExportNode* bse_export_node (); \ |
| 136 |
- template<> static BseExportNode* \ |
| 137 |
-+ template<> BseExportNode* \ |
| 138 |
++ template<> static_template BseExportNode* \ |
| 139 |
bse_export_node<EnumType> () \ |
| 140 |
{ \ |
| 141 |
static BseExportNodeEnum enode = { \ |
| 142 |
-@@ -145,7 +145,7 @@ |
| 143 |
+@@ -145,7 +153,7 @@ |
| 144 |
(::NameSpace::bse_type_keeper__1##RecordType.get_type ()) |
| 145 |
#define BSE_CXX_DECLARE_RECORD(RecordType) \ |
| 146 |
template<class E> static BseExportNode* bse_export_node (); \ |
| 147 |
- template<> static BseExportNode* \ |
| 148 |
-+ template<> BseExportNode* \ |
| 149 |
++ template<> static_template BseExportNode* \ |
| 150 |
bse_export_node<RecordType> () \ |
| 151 |
{ \ |
| 152 |
static BseExportNodeBoxed bnode = { \ |
| 153 |
-@@ -181,7 +181,7 @@ |
| 154 |
+@@ -181,7 +189,7 @@ |
| 155 |
(::NameSpace::bse_type_keeper__2##SequenceType.get_type ()) |
| 156 |
#define BSE_CXX_DECLARE_SEQUENCE(SequenceType) \ |
| 157 |
template<class E> static BseExportNode* bse_export_node (); \ |
| 158 |
- template<> static BseExportNode* \ |
| 159 |
-+ template<> BseExportNode* \ |
| 160 |
++ template<> static_template BseExportNode* \ |
| 161 |
bse_export_node<SequenceType> () \ |
| 162 |
{ \ |
| 163 |
static BseExportNodeBoxed bnode = { \ |
| 164 |
-@@ -219,7 +219,7 @@ |
| 165 |
+@@ -219,7 +227,7 @@ |
| 166 |
extern ::Bse::ExportTypeKeeper bse_type_keeper__9##ProcType; |
| 167 |
#define BSE_CXX_REGISTER_PROCEDURE(ProcType) \ |
| 168 |
template<class C> static ::BseExportNode* bse_export_node (); \ |
| 169 |
- template<> static ::BseExportNode* \ |
| 170 |
-+ template<> ::BseExportNode* \ |
| 171 |
++ template<> static_template ::BseExportNode* \ |
| 172 |
bse_export_node<Procedure::ProcType> () \ |
| 173 |
{ \ |
| 174 |
static ::BseExportNodeProc pnode = { \ |
| 175 |
-@@ -259,7 +259,7 @@ |
| 176 |
+@@ -259,7 +267,7 @@ |
| 177 |
#define BSE_CXX_REGISTER_EFFECT(Effect) \ |
| 178 |
BSE_CXX_DEFINE_STATIC_DATA (Effect##Base); \ |
| 179 |
template<class C> static ::BseExportNode* bse_export_node (); \ |
| 180 |
- template<> static ::BseExportNode* \ |
| 181 |
-+ template<> ::BseExportNode* \ |
| 182 |
++ template<> static_template ::BseExportNode* \ |
| 183 |
bse_export_node<Effect> () \ |
| 184 |
{ \ |
| 185 |
static ::BseExportNodeClass cnode = { \ |
| 186 |
-only in patch2: |
| 187 |
-unchanged: |
| 188 |
---- beast-0.7.1.orig/bse/Makefile.in |
| 189 |
-+++ beast-0.7.1/bse/Makefile.in |
| 190 |
-@@ -422,7 +422,7 @@ |
| 191 |
- # need -I$(srcdir) for "bseserver.h" in .genprc.c |
| 192 |
- # need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc |
| 193 |
- INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. \ |
| 194 |
-- $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS |
| 195 |
-+ $(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS |
| 196 |
- EXTRA_HEADERS = |
| 197 |
- MAINTAINERCLEANFILES = $(GENERATED) $(am__append_2) |
| 198 |
- # -Wl,-Bsymbolic |
| 199 |
-only in patch2: |
| 200 |
-unchanged: |
| 201 |
---- beast-0.7.1.orig/bse/bseloader-guspatch.cc |
| 202 |
-+++ beast-0.7.1/bse/bseloader-guspatch.cc |
| 203 |
+Index: beast-0.7.1/bse/bseloader-guspatch.cc |
| 204 |
+=================================================================== |
| 205 |
+--- beast-0.7.1.orig/bse/bseloader-guspatch.cc 2006-11-25 16:04:31.000000000 +0000 |
| 206 |
++++ beast-0.7.1/bse/bseloader-guspatch.cc 2008-03-24 14:10:47.000000000 +0000 |
| 207 |
@@ -22,6 +22,7 @@ |
| 208 |
#include <errno.h> |
| 209 |
#include <vector> |
| 210 |
@@ -140,10 +144,10 @@ |
| 211 |
|
| 212 |
#undef WITH_GUSPATCH_XINFOS |
| 213 |
static SFI_MSG_TYPE_DEFINE (debug_guspatch, "guspatch", SFI_MSG_DEBUG, NULL); |
| 214 |
-only in patch2: |
| 215 |
-unchanged: |
| 216 |
---- beast-0.7.1.orig/bse/bsesequencer.cc |
| 217 |
-+++ beast-0.7.1/bse/bsesequencer.cc |
| 218 |
+Index: beast-0.7.1/bse/bsesequencer.cc |
| 219 |
+=================================================================== |
| 220 |
+--- beast-0.7.1.orig/bse/bsesequencer.cc 2006-12-26 21:41:25.000000000 +0000 |
| 221 |
++++ beast-0.7.1/bse/bsesequencer.cc 2008-03-24 14:10:47.000000000 +0000 |
| 222 |
@@ -30,6 +30,7 @@ |
| 223 |
#include <fcntl.h> |
| 224 |
#include <errno.h> |
| 225 |
@@ -152,10 +156,10 @@ |
| 226 |
|
| 227 |
/* due to a linker/compiler bug on SuSE 9.2, we need to |
| 228 |
* define extern "C" symbols outside of any C++ namespace, |
| 229 |
-only in patch2: |
| 230 |
-unchanged: |
| 231 |
---- beast-0.7.1.orig/sfi/sfidl-cxxbase.cc |
| 232 |
-+++ beast-0.7.1/sfi/sfidl-cxxbase.cc |
| 233 |
+Index: beast-0.7.1/sfi/sfidl-cxxbase.cc |
| 234 |
+=================================================================== |
| 235 |
+--- beast-0.7.1.orig/sfi/sfidl-cxxbase.cc 2005-03-07 06:23:55.000000000 +0000 |
| 236 |
++++ beast-0.7.1/sfi/sfidl-cxxbase.cc 2008-03-24 14:10:47.000000000 +0000 |
| 237 |
@@ -23,6 +23,7 @@ |
| 238 |
#include <unistd.h> |
| 239 |
#include <errno.h> |
| 240 |
@@ -164,10 +168,10 @@ |
| 241 |
#include "sfidl-namespace.hh" |
| 242 |
#include "sfidl-options.hh" |
| 243 |
#include "sfidl-parser.hh" |
| 244 |
-only in patch2: |
| 245 |
-unchanged: |
| 246 |
---- beast-0.7.1.orig/sfi/sfidl-namespace.cc |
| 247 |
-+++ beast-0.7.1/sfi/sfidl-namespace.cc |
| 248 |
+Index: beast-0.7.1/sfi/sfidl-namespace.cc |
| 249 |
+=================================================================== |
| 250 |
+--- beast-0.7.1.orig/sfi/sfidl-namespace.cc 2005-03-07 06:23:55.000000000 +0000 |
| 251 |
++++ beast-0.7.1/sfi/sfidl-namespace.cc 2008-03-24 14:10:47.000000000 +0000 |
| 252 |
@@ -21,6 +21,7 @@ |
| 253 |
#include <list> |
| 254 |
#include <string> |
| 255 |
@@ -176,10 +180,10 @@ |
| 256 |
#include "sfidl-namespace.hh" |
| 257 |
#include <sfi/glib-extra.h> |
| 258 |
|
| 259 |
-only in patch2: |
| 260 |
-unchanged: |
| 261 |
---- beast-0.7.1.orig/sfi/sfidl-options.cc |
| 262 |
-+++ beast-0.7.1/sfi/sfidl-options.cc |
| 263 |
+Index: beast-0.7.1/sfi/sfidl-options.cc |
| 264 |
+=================================================================== |
| 265 |
+--- beast-0.7.1.orig/sfi/sfidl-options.cc 2005-03-07 06:23:55.000000000 +0000 |
| 266 |
++++ beast-0.7.1/sfi/sfidl-options.cc 2008-03-24 14:10:47.000000000 +0000 |
| 267 |
@@ -22,6 +22,7 @@ |
| 268 |
#include "topconfig.h" |
| 269 |
#include <sfi/glib-extra.h> |
| 270 |
@@ -188,10 +192,10 @@ |
| 271 |
|
| 272 |
/* FIXME: should be filled out and written into topconfig.h by configure */ |
| 273 |
#define SFIDL_VERSION BST_VERSION |
| 274 |
-only in patch2: |
| 275 |
-unchanged: |
| 276 |
---- beast-0.7.1.orig/sfi/sficxx.hh |
| 277 |
-+++ beast-0.7.1/sfi/sficxx.hh |
| 278 |
+Index: beast-0.7.1/sfi/sficxx.hh |
| 279 |
+=================================================================== |
| 280 |
+--- beast-0.7.1.orig/sfi/sficxx.hh 2006-10-05 10:21:50.000000000 +0000 |
| 281 |
++++ beast-0.7.1/sfi/sficxx.hh 2008-03-24 14:10:47.000000000 +0000 |
| 282 |
@@ -23,6 +23,7 @@ |
| 283 |
#include <sfi/sfi.h> |
| 284 |
#include <string> |
| 285 |
@@ -200,10 +204,10 @@ |
| 286 |
|
| 287 |
namespace Sfi { |
| 288 |
|
| 289 |
-only in patch2: |
| 290 |
-unchanged: |
| 291 |
---- beast-0.7.1.orig/sfi/sfidl-factory.cc |
| 292 |
-+++ beast-0.7.1/sfi/sfidl-factory.cc |
| 293 |
+Index: beast-0.7.1/sfi/sfidl-factory.cc |
| 294 |
+=================================================================== |
| 295 |
+--- beast-0.7.1.orig/sfi/sfidl-factory.cc 2005-03-07 06:23:55.000000000 +0000 |
| 296 |
++++ beast-0.7.1/sfi/sfidl-factory.cc 2008-03-24 14:10:47.000000000 +0000 |
| 297 |
@@ -18,6 +18,7 @@ |
| 298 |
*/ |
| 299 |
#include "sfidl-factory.hh" |
| 300 |
@@ -212,10 +216,10 @@ |
| 301 |
|
| 302 |
using namespace Sfidl; |
| 303 |
using namespace std; |
| 304 |
-only in patch2: |
| 305 |
-unchanged: |
| 306 |
---- beast-0.7.1.orig/sfi/sfidl-parser.cc |
| 307 |
-+++ beast-0.7.1/sfi/sfidl-parser.cc |
| 308 |
+Index: beast-0.7.1/sfi/sfidl-parser.cc |
| 309 |
+=================================================================== |
| 310 |
+--- beast-0.7.1.orig/sfi/sfidl-parser.cc 2006-11-14 22:51:36.000000000 +0000 |
| 311 |
++++ beast-0.7.1/sfi/sfidl-parser.cc 2008-03-24 14:10:47.000000000 +0000 |
| 312 |
@@ -27,6 +27,9 @@ |
| 313 |
#include <iostream> |
| 314 |
#include <set> |
| 315 |
@@ -226,10 +230,10 @@ |
| 316 |
|
| 317 |
const std::string |
| 318 |
Sfidl::string_from_int (long long int lli) |
| 319 |
-only in patch2: |
| 320 |
-unchanged: |
| 321 |
---- beast-0.7.1.orig/tests/bse/filtertest.cc |
| 322 |
-+++ beast-0.7.1/tests/bse/filtertest.cc |
| 323 |
+Index: beast-0.7.1/tests/bse/filtertest.cc |
| 324 |
+=================================================================== |
| 325 |
+--- beast-0.7.1.orig/tests/bse/filtertest.cc 2006-12-04 00:01:08.000000000 +0000 |
| 326 |
++++ beast-0.7.1/tests/bse/filtertest.cc 2008-03-24 14:10:47.000000000 +0000 |
| 327 |
@@ -28,6 +28,7 @@ |
| 328 |
#include <birnet/birnettests.h> |
| 329 |
#include "topconfig.h" |
| 330 |
@@ -238,10 +242,10 @@ |
| 331 |
|
| 332 |
using std::string; |
| 333 |
using std::vector; |
| 334 |
-only in patch2: |
| 335 |
-unchanged: |
| 336 |
---- beast-0.7.1.orig/tools/bsewavetool.cc |
| 337 |
-+++ beast-0.7.1/tools/bsewavetool.cc |
| 338 |
+Index: beast-0.7.1/tools/bsewavetool.cc |
| 339 |
+=================================================================== |
| 340 |
+--- beast-0.7.1.orig/tools/bsewavetool.cc 2006-12-11 19:00:07.000000000 +0000 |
| 341 |
++++ beast-0.7.1/tools/bsewavetool.cc 2008-03-24 14:10:47.000000000 +0000 |
| 342 |
@@ -34,6 +34,7 @@ |
| 343 |
#include <fcntl.h> |
| 344 |
#include <vector> |
| 345 |
@@ -250,10 +254,10 @@ |
| 346 |
|
| 347 |
|
| 348 |
namespace BseWaveTool { |
| 349 |
-only in patch2: |
| 350 |
-unchanged: |
| 351 |
---- beast-0.7.1.orig/tools/bsefcompare.cc |
| 352 |
-+++ beast-0.7.1/tools/bsefcompare.cc |
| 353 |
+Index: beast-0.7.1/tools/bsefcompare.cc |
| 354 |
+=================================================================== |
| 355 |
+--- beast-0.7.1.orig/tools/bsefcompare.cc 2006-12-04 00:01:06.000000000 +0000 |
| 356 |
++++ beast-0.7.1/tools/bsefcompare.cc 2008-03-24 14:10:47.000000000 +0000 |
| 357 |
@@ -28,6 +28,7 @@ |
| 358 |
#include <sys/types.h> |
| 359 |
#include <sys/stat.h> |
| 360 |
@@ -262,10 +266,10 @@ |
| 361 |
|
| 362 |
#include "topconfig.h" |
| 363 |
|
| 364 |
-only in patch2: |
| 365 |
-unchanged: |
| 366 |
---- beast-0.7.1.orig/tools/bsefextract.cc |
| 367 |
-+++ beast-0.7.1/tools/bsefextract.cc |
| 368 |
+Index: beast-0.7.1/tools/bsefextract.cc |
| 369 |
+=================================================================== |
| 370 |
+--- beast-0.7.1.orig/tools/bsefextract.cc 2006-11-05 02:21:30.000000000 +0000 |
| 371 |
++++ beast-0.7.1/tools/bsefextract.cc 2008-03-24 14:10:47.000000000 +0000 |
| 372 |
@@ -27,6 +27,8 @@ |
| 373 |
#include <errno.h> |
| 374 |
#include <assert.h> |
| 375 |
@@ -275,10 +279,10 @@ |
| 376 |
|
| 377 |
#include <map> |
| 378 |
#include <string> |
| 379 |
-only in patch2: |
| 380 |
-unchanged: |
| 381 |
---- beast-0.7.1.orig/birnet/tests/sorting.cc |
| 382 |
-+++ beast-0.7.1/birnet/tests/sorting.cc |
| 383 |
+Index: beast-0.7.1/birnet/tests/sorting.cc |
| 384 |
+=================================================================== |
| 385 |
+--- beast-0.7.1.orig/birnet/tests/sorting.cc 2006-10-21 15:13:41.000000000 +0000 |
| 386 |
++++ beast-0.7.1/birnet/tests/sorting.cc 2008-03-24 14:10:47.000000000 +0000 |
| 387 |
@@ -19,6 +19,8 @@ |
| 388 |
// #define TEST_VERBOSE |
| 389 |
#include <birnet/birnettests.h> |
| 390 |
@@ -288,10 +292,10 @@ |
| 391 |
|
| 392 |
namespace { |
| 393 |
using namespace Birnet; |
| 394 |
-only in patch2: |
| 395 |
-unchanged: |
| 396 |
---- beast-0.7.1.orig/birnet/tests/strings.cc |
| 397 |
-+++ beast-0.7.1/birnet/tests/strings.cc |
| 398 |
+Index: beast-0.7.1/birnet/tests/strings.cc |
| 399 |
+=================================================================== |
| 400 |
+--- beast-0.7.1.orig/birnet/tests/strings.cc 2006-12-18 17:58:23.000000000 +0000 |
| 401 |
++++ beast-0.7.1/birnet/tests/strings.cc 2008-03-24 14:10:47.000000000 +0000 |
| 402 |
@@ -18,6 +18,7 @@ |
| 403 |
*/ |
| 404 |
//#define TEST_VERBOSE |
| 405 |
@@ -300,10 +304,10 @@ |
| 406 |
using namespace Birnet; |
| 407 |
|
| 408 |
namespace { |
| 409 |
-only in patch2: |
| 410 |
-unchanged: |
| 411 |
---- beast-0.7.1.orig/birnet/tests/threads.cc |
| 412 |
-+++ beast-0.7.1/birnet/tests/threads.cc |
| 413 |
+Index: beast-0.7.1/birnet/tests/threads.cc |
| 414 |
+=================================================================== |
| 415 |
+--- beast-0.7.1.orig/birnet/tests/threads.cc 2006-10-21 15:12:11.000000000 +0000 |
| 416 |
++++ beast-0.7.1/birnet/tests/threads.cc 2008-03-24 14:10:47.000000000 +0000 |
| 417 |
@@ -18,6 +18,7 @@ |
| 418 |
*/ |
| 419 |
//#define TEST_VERBOSE |
| 420 |
@@ -312,10 +316,10 @@ |
| 421 |
|
| 422 |
namespace { |
| 423 |
using namespace Birnet; |
| 424 |
-only in patch2: |
| 425 |
-unchanged: |
| 426 |
---- beast-0.7.1.orig/birnet/birnetutils.cc |
| 427 |
-+++ beast-0.7.1/birnet/birnetutils.cc |
| 428 |
+Index: beast-0.7.1/birnet/birnetutils.cc |
| 429 |
+=================================================================== |
| 430 |
+--- beast-0.7.1.orig/birnet/birnetutils.cc 2006-12-18 17:58:24.000000000 +0000 |
| 431 |
++++ beast-0.7.1/birnet/birnetutils.cc 2008-03-24 14:10:47.000000000 +0000 |
| 432 |
@@ -31,6 +31,7 @@ |
| 433 |
#include <algorithm> |
| 434 |
#include <cxxabi.h> |
| 435 |
@@ -324,10 +328,10 @@ |
| 436 |
|
| 437 |
#ifndef _ |
| 438 |
#define _(s) s |
| 439 |
-only in patch2: |
| 440 |
-unchanged: |
| 441 |
---- beast-0.7.1.orig/birnet/birnetsignal.hh |
| 442 |
-+++ beast-0.7.1/birnet/birnetsignal.hh |
| 443 |
+Index: beast-0.7.1/birnet/birnetsignal.hh |
| 444 |
+=================================================================== |
| 445 |
+--- beast-0.7.1.orig/birnet/birnetsignal.hh 2006-10-06 21:57:38.000000000 +0000 |
| 446 |
++++ beast-0.7.1/birnet/birnetsignal.hh 2008-03-24 14:10:47.000000000 +0000 |
| 447 |
@@ -435,7 +435,7 @@ |
| 448 |
/* --- predefined signals --- */ |
| 449 |
template<class Emitter> |
| 450 |
@@ -346,10 +350,10 @@ |
| 451 |
explicit SignalVoid (Emitter &emitter) : Signal0 (emitter) {} |
| 452 |
explicit SignalVoid (Emitter &emitter, void (Emitter::*method) (void)) : Signal0 (emitter, method) {} |
| 453 |
BIRNET_PRIVATE_CLASS_COPY (SignalVoid); |
| 454 |
-only in patch2: |
| 455 |
-unchanged: |
| 456 |
---- beast-0.7.1.orig/birnet/birnetmsg.cc |
| 457 |
-+++ beast-0.7.1/birnet/birnetmsg.cc |
| 458 |
+Index: beast-0.7.1/birnet/birnetmsg.cc |
| 459 |
+=================================================================== |
| 460 |
+--- beast-0.7.1.orig/birnet/birnetmsg.cc 2006-11-21 01:31:27.000000000 +0000 |
| 461 |
++++ beast-0.7.1/birnet/birnetmsg.cc 2008-03-24 14:10:47.000000000 +0000 |
| 462 |
@@ -21,6 +21,7 @@ |
| 463 |
#include "birnetthread.hh" |
| 464 |
#include <syslog.h> |
| 465 |
@@ -358,10 +362,10 @@ |
| 466 |
|
| 467 |
#ifndef _ // FIXME |
| 468 |
#define _(x) (x) |
| 469 |
-only in patch2: |
| 470 |
-unchanged: |
| 471 |
---- beast-0.7.1.orig/birnet/birnetsignaltemplate.hh |
| 472 |
-+++ beast-0.7.1/birnet/birnetsignaltemplate.hh |
| 473 |
+Index: beast-0.7.1/birnet/birnetsignaltemplate.hh |
| 474 |
+=================================================================== |
| 475 |
+--- beast-0.7.1.orig/birnet/birnetsignaltemplate.hh 2006-10-03 23:12:43.000000000 +0000 |
| 476 |
++++ beast-0.7.1/birnet/birnetsignaltemplate.hh 2008-03-24 14:10:47.000000000 +0000 |
| 477 |
@@ -165,7 +165,7 @@ |
| 478 |
template<class Emitter, typename R0, typename A1, typename A2, typename A3, class Collector> |
| 479 |
struct Signal<Emitter, R0 (A1, A2, A3), Collector> : Signal3<Emitter, R0, A1, A2, A3, Collector> |
Archives