Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

daemon/src/audio/audiolayer.cpp

@@ -49,6 +49,9 @@ AudioLayer::AudioLayer()
     urgentRingBuffer_.createReadPointer(MainBuffer::DEFAULT_ID);
 }
 
+AudioLayer::~AudioLayer()
+{}
+
 void AudioLayer::flushMain()
 {
     std::lock_guard<std::mutex> lock(mutex_);

daemon/src/audio/audiolayer.h

@@ -80,7 +80,7 @@ class AudioLayer {
         };
 
         AudioLayer();
-        virtual ~AudioLayer() = default;
+        virtual ~AudioLayer();
 
         virtual std::vector<std::string> getCaptureDeviceList() const = 0;
         virtual std::vector<std::string> getPlaybackDeviceList() const = 0;

daemon/src/config/sfl_config.h

@@ -149,10 +149,6 @@ class ConfigTree {
         friend class ConfigTreeIterator;
 
         NON_COPYABLE(ConfigTree);
-    public:
-        ConfigTreeIterator createIterator() {
-            return ConfigTreeIterator(this);
-        }
 };
 
 class ConfigTreeItem {

daemon/src/noncopyable.h

@@ -40,7 +40,7 @@
  */
 
 #define NON_COPYABLE(ClassName) \
-    ClassName(const ClassName&); \
-    ClassName& operator=(const ClassName&)
+    ClassName(const ClassName&) = delete; \
+    ClassName& operator=(const ClassName&) = delete
 
 #endif  // NON_COPYABLE_H_