From 4595f26a89ddf84e6244d711ef7a28f7b955974f Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Mon, 30 Jan 2012 10:48:10 -0500
Subject: [PATCH] * #8461: suppress warnings from ccrtp
---
daemon/src/audio/audiortp/audio_rtp_session.h | 6 +++---
daemon/src/audio/audiortp/audio_symmetric_rtp_session.h | 9 ++++++---
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/daemon/src/audio/audiortp/audio_rtp_session.h b/daemon/src/audio/audiortp/audio_rtp_session.h
index 58031f9aba..4f8723b234 100644
--- a/daemon/src/audio/audiortp/audio_rtp_session.h
+++ b/daemon/src/audio/audiortp/audio_rtp_session.h
@@ -31,8 +31,8 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
-#ifndef __SFL_AUDIO_RTP_SESSION_H__
-#define __SFL_AUDIO_RTP_SESSION_H__
+#ifndef SFL_AUDIO_RTP_SESSION_H_
+#define SFL_AUDIO_RTP_SESSION_H_
#include "audio_rtp_record_handler.h"
#include <audio/codecs/audiocodec.h>
@@ -153,5 +153,5 @@ class AudioRtpSession : public AudioRtpRecordHandler {
};
}
-#endif // __AUDIO_RTP_SESSION_H__
+#endif // AUDIO_RTP_SESSION_H__
diff --git a/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h b/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h
index 162bcadbed..256e55ae69 100644
--- a/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h
+++ b/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h
@@ -31,8 +31,8 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
-#ifndef __AUDIO_SYMMETRIC_RTP_SESSION_H__
-#define __AUDIO_SYMMETRIC_RTP_SESSION_H__
+#ifndef AUDIO_SYMMETRIC_RTP_SESSION_H_
+#define AUDIO_SYMMETRIC_RTP_SESSION_H_
#include <exception>
#include <cassert>
@@ -43,6 +43,8 @@
using std::ptrdiff_t;
+
+#pragma GCC diagnostic ignored "-Weffc++"
#include <ccrtp/rtp.h>
#include <ccrtp/iqueue.h>
#include <cc++/numbers.h> // ost::Time
@@ -93,5 +95,6 @@ class AudioSymmetricRtpSession : public ost::TimerPort, public ost::SymmetricRTP
};
}
-#endif // __AUDIO_SYMMETRIC_RTP_SESSION_H__
+#pragma GCC diagnostic warning "-Weffc++"
+#endif // AUDIO_SYMMETRIC_RTP_SESSION_H__
--
GitLab