← 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/manager.h

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-05-19 21:46:37 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20120519214637-la8rbrford5kj6m3
Tags: 1.1.0-1
http://bugs.debian.org/663282
http://bugs.debian.org/665789
* New upstream release 
  - Fixes "FTBFS with libccrtp-dev/2.0.2 from experimental" (Closes: #663282)
* NEW Maintainer: Debian VoIP Team - Thanks Francois for your work.
  - (Closes: #665789: O: sflphone -- SIP and IAX2 compatible VoIP phone)
* Added Build-Depends: libdbus-c++-bin
* Add gcc47-fixes.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/manager.h
29
29
 *  as that of the covered work.
30
30
 */
31
31
 
32
 
#ifndef SFLPHONE_MANAGER_H
33
 
#define SFLPHONE_MANAGER_H
 
32
#ifndef MANAGER_H_
 
33
#define MANAGER_H_
34
34
 
35
 
#include "utilspp/singleton.hpp"
 
35
// we could forward declare ManagerImpl BUT anyone who will call instance
 
36
// will need this include.
36
37
#include "managerimpl.h"
37
38
 
38
 
typedef utilspp::SingletonHolder<ManagerImpl> Manager;
 
39
namespace Manager {
 
40
    ManagerImpl& instance();
 
41
}
39
42
 
40
 
#endif
 
43
#endif // MANAGER_H_
41
44