Bug#356233: patch

[Tim Janik]

On Fri, 7 Apr 2006, Joost Yervante Damad wrote:


Hello,

the attached patch seems to fix this bug.

It's all namespace declaration fixes.

Greetings, Joost Damad



this is a comment from upstream.
beast-0.6.7 (or -0.7.0) will fix gcc-4.1 issues, but it may still take a
while until it's released.
allthough in upstream we fixed the issues at hand in a different way,
the proposed patch looks good and can be applied to fix the debian
beast-0.6.6 package until beast-0.6.7 is released.

---
ciaoTJ


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#356233: patch

[Joost Yervante Damad]

Hello,

the attached patch seems to fix this bug.

It's all namespace declaration fixes.

Greetings, Joost Damad
--- beast-0.6.6.orig/sfi/sfidl-parser.cc
+++ beast-0.6.6/sfi/sfidl-parser.cc
@@ -28,7 +28,7 @@
 #include set
 #include stack
 
-namespace {
+namespace Sfidl {
 using namespace Sfidl;
 using namespace std;
 
@@ -2129,7 +2129,7 @@
   setNamespace * done;
   listSymbol * alternatives;
 
-  ::qualifyHelper (name, currentNamespace, alternatives, done);
+  Sfidl::qualifyHelper (name, currentNamespace, alternatives, done);
 
   /* no match? */
   if (alternatives.empty())
--- beast-0.6.6.orig/sfi/sfidl-corec.cc
+++ beast-0.6.6/sfi/sfidl-corec.cc
@@ -80,7 +80,7 @@
   }
   
   void
-  CodeGeneratorCoreC::help()
+  help()
   {
 CodeGenerator::help();
 fprintf (stderr,  --init name   set the name of the init function\n);
--- beast-0.6.6.orig/bse/bsecxxvalue.cc
+++ beast-0.6.6/bse/bsecxxvalue.cc
@@ -18,7 +18,7 @@
 #include bsecxxvalue.hh
 #include bsecxxbase.hh
 
-namespace {
+namespace Bse {
 using namespace Bse;
 
 SfiNum
--- beast-0.6.6.orig/bse/bsecxxutils.cc
+++ beast-0.6.6/bse/bsecxxutils.cc
@@ -22,7 +22,7 @@
 #include list
 using namespace std;
 
-namespace {
+namespace Bse {
 using namespace Bse;
 
 /* --- functions --- */
--- beast-0.6.6.orig/bse/bsecxxbase.cc
+++ beast-0.6.6/bse/bsecxxbase.cc
@@ -17,7 +17,7 @@
  */
 #include bsecxxbase.hh
 
-namespace {
+namespace Bse {
 using namespace Bse;
 
 static void bse_cxx_base_class_base_init (gpointer g_class);
--- beast-0.6.6.orig/bse/bsecxxclosure.cc
+++ beast-0.6.6/bse/bsecxxclosure.cc
@@ -18,7 +18,7 @@
 #if defined BSE_COMPILATION
 #include bsecxxclosure.hh
 
-namespace {
+namespace Bse {
 using namespace Bse;
 
 CxxClosure::CxxClosure()
--- beast-0.6.6.orig/bse/bsecxxmodule.cc
+++ beast-0.6.6/bse/bsecxxmodule.cc
@@ -20,7 +20,7 @@
 #include bsemidireceiver.h
 #include bsesnet.h
 
-namespace {
+namespace Bse {
 using namespace Bse;
 
 const ClassInfo cinfo (NULL, BseEffect implements an abstract C++ effect base.);
--- beast-0.6.6.orig/bse/bsecxxmodule.hh
+++ beast-0.6.6/bse/bsecxxmodule.hh
@@ -165,19 +165,19 @@
 };
 /* implement Bse::Effect and Bse::SynthesisModule methods */
 #define BSE_EFFECT_INTEGRATE_MODULE(ObjectType,ModuleType,ParamType)\
-Bse::SynthesisModule*   \
-ObjectType::create_module (unsigned int context_handle, \
+SynthesisModule*   \
+create_module (unsigned int context_handle, \
BseTrans*trans)  \
 { /* create a synthesis module */   \
   return new ModuleType();  \
 }   \
-Bse::SynthesisModule::Closure*  \
-ObjectType::make_module_config_closure()\
+SynthesisModule::Closure*  \
+make_module_config_closure()\
 {   \
   return SynthesisModule::make_closure (ModuleType::config, ParamType (this)); \
 }   \
-Bse::SynthesisModule::AutoUpdate\
-ObjectType::get_module_auto_update()\
+SynthesisModule::AutoUpdate\
+get_module_auto_update()\
 {   \
   return SynthesisModule::TrampolineModuleType,ParamType,  \
   ObjectType::AutoUpdateCategory::auto_update_accessor;\