[patch] upstream's patch to fix building with gcc-4.7

linuxsampler-r2335.patch (text/plain), 4.64 KB, created by Kacper Kowalik (Xarthisius) (RETIRED) on 2012-06-23 11:38:18 UTC

Index: src/effects/LadspaEffect.cpp
===================================================================
--- src/effects/LadspaEffect.cpp	(revision 2334)
+++ src/effects/LadspaEffect.cpp	(revision 2335)
@@ -64,12 +64,12 @@
  */
 class LadspaEffectControl : public EffectControl {
 public:
-    EffectControl::SetDefaultValue;
-    EffectControl::SetMinValue;
-    EffectControl::SetMaxValue;
-    EffectControl::SetType;
-    EffectControl::SetDescription;
-    EffectControl::SetPossibilities;
+    using EffectControl::SetDefaultValue;
+    using EffectControl::SetMinValue;
+    using EffectControl::SetMaxValue;
+    using EffectControl::SetType;
+    using EffectControl::SetDescription;
+    using EffectControl::SetPossibilities;
 };
 
 ////////////////////////////////////////////////////////////////////////////
Index: src/common/Pool.h
===================================================================
--- src/common/Pool.h	(revision 2334)
+++ src/common/Pool.h	(revision 2335)
@@ -3,7 +3,7 @@
  *   LinuxSampler - modular, streaming capable sampler                     *
  *                                                                         *
  *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
- *   Copyright (C) 2005 - 2008 Christian Schoenebeck                       *
+ *   Copyright (C) 2005 - 2012 Christian Schoenebeck                       *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -406,7 +406,7 @@
         inline Iterator allocAppend() {
             if (pPool->poolIsEmpty()) return RTListBase<T>::begin();
             Iterator element = pPool->alloc();
-            append(element);
+            this->append(element);
             #if CONFIG_DEVMODE
             element.list = this;
             #endif // CONFIG_DEVMODE
Index: src/engines/EngineChannelBase.h
===================================================================
--- src/engines/EngineChannelBase.h	(revision 2334)
+++ src/engines/EngineChannelBase.h	(revision 2335)
@@ -219,7 +219,7 @@
                 pEvents->clear();
                 // empty MIDI key specific event lists
                 ClearEventListsHandler handler;
-                ProcessActiveVoices(&handler);
+                this->ProcessActiveVoices(&handler);
 
                 // empty exclusive group specific event lists
                 ClearGroupEventLists();
@@ -263,7 +263,7 @@
 
             void RenderActiveVoices(uint Samples) {
                 RenderVoicesHandler handler(this, Samples);
-                ProcessActiveVoices(&handler);
+                this->ProcessActiveVoices(&handler);
 
                 SetVoiceCount(handler.VoiceCount);
                 SetDiskStreamCount(handler.StreamCount);
Index: src/engines/InstrumentManagerBase.h
===================================================================
--- src/engines/InstrumentManagerBase.h	(revision 2334)
+++ src/engines/InstrumentManagerBase.h	(revision 2335)
@@ -90,7 +90,7 @@
                     RegionInfo[*i].refCount++;
                     SampleRefCount[(*i)->pSample]++;
                 }
-                HandBack(pResource, pConsumer, true);
+                this->HandBack(pResource, pConsumer, true);
                 RegionInfoMutex.Unlock();
             }
 
@@ -126,7 +126,7 @@
 
             virtual void SetMode(const InstrumentManager::instrument_id_t& ID, InstrumentManager::mode_t Mode) {
                 dmsg(2,("InstrumentManagerBase: setting mode for %s (Index=%d) to %d\n",ID.FileName.c_str(),ID.Index,Mode));
-                SetAvailabilityMode(ID, static_cast<typename ResourceManager<instrument_id_t, I>::mode_t>(Mode));
+                this->SetAvailabilityMode(ID, static_cast<typename ResourceManager<instrument_id_t, I>::mode_t>(Mode));
             }
 
     protected:
@@ -241,7 +241,7 @@
 
                 if (pEntry->MaxSamplesPerCycle < maxSamplesPerCycle) {
                     dmsg(1,("Completely reloading instrument due to insufficient precached samples ...\n"));
-                    Update(pResource, pConsumer);
+                    this->Update(pResource, pConsumer);
                 }
             }
     };
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 2334)
+++ ChangeLog	(revision 2335)
@@ -18,6 +18,7 @@
     - Mac OS X: made it possible to specify plugin installation dir to
       configure
     - Mac OS X: Makefile fix for the install-strip target
+    - fixed compilation with gcc 4.7
 
   * general changes:
     - Refactoring: moved the independent code from