← Back to branch summary

~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2

« back to all changes in this revision

Viewing changes to daemon/src/audio/audiortp/audio_symmetric_rtp_session.h

  • Committer: Package Import Robot
  • Author(s): Francois Marier
  • Date: 2012-02-18 21:47:09 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120218214709-6362d71gqdsdkrj5
Tags: 1.0.2-1
http://bugs.debian.org/658987
* New upstream release
  - remove logging patch (applied upstream)
  - update s390 patch since it was partially applied upstream
* Include the Evolution plugin as a separate binary package

* Fix compilation issues on SH4 (closes: #658987)
* Merge Ubuntu's binutils-gold linking fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/audio/audiortp/audio_symmetric_rtp_session.h
31
31
 *  shall include the source code for the parts of OpenSSL used as well
32
32
 *  as that of the covered work.
33
33
 */
34
 
#ifndef __AUDIO_SYMMETRIC_RTP_SESSION_H__
35
 
#define __AUDIO_SYMMETRIC_RTP_SESSION_H__
 
34
#ifndef AUDIO_SYMMETRIC_RTP_SESSION_H_
 
35
#define AUDIO_SYMMETRIC_RTP_SESSION_H_
36
36
 
37
37
#include <exception>
38
38
#include <cassert>
43
43
 
44
44
using std::ptrdiff_t;
45
45
 
 
46
 
 
47
#pragma GCC diagnostic ignored "-Weffc++"
46
48
#include <ccrtp/rtp.h>
47
49
#include <ccrtp/iqueue.h>
48
50
#include <cc++/numbers.h> // ost::Time
93
95
};
94
96
 
95
97
}
96
 
#endif // __AUDIO_SYMMETRIC_RTP_SESSION_H__
 
98
#pragma GCC diagnostic warning "-Weffc++"
 
99
#endif // AUDIO_SYMMETRIC_RTP_SESSION_H__
97
100