kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 43472,43495 from trunk

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@43582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Cadach
2006-09-25 06:15:24 +00:00
parent 4a8a46a162
commit 4b81fe1d28
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_h323.c
View File

@@ -2676,7 +2676,7 @@ static int reload_config(int is_reload)
struct oh323_alias *alias = NULL; struct oh323_alias *alias = NULL;
struct ast_hostent ahp; struct hostent *hp; struct ast_hostent ahp; struct hostent *hp;
char *cat; char *cat;
char *utype; const char *utype;
int is_user, is_peer, is_alias; int is_user, is_peer, is_alias;
char _gatekeeper[100]; char _gatekeeper[100];
int gk_discover, gk_disable, gk_changed; int gk_discover, gk_disable, gk_changed;
@@ -2721,7 +2721,7 @@ static int reload_config(int is_reload)
if (ucfg) { if (ucfg) {
struct ast_variable *gen; struct ast_variable *gen;
int genhas_h323; int genhas_h323;
char *has_h323; const char *has_h323;
genhas_h323 = ast_true(ast_variable_retrieve(ucfg, "general", "hash323")); genhas_h323 = ast_true(ast_variable_retrieve(ucfg, "general", "hash323"));
gen = ast_variable_browse(ucfg, "general"); gen = ast_variable_browse(ucfg, "general");

2
channels/h323/caps_h323.cxx
View File

@@ -1,5 +1,7 @@
#include <ptlib.h> #include <ptlib.h>
#include <h323.h> #include <h323.h>
#include <h245.h>
#include "ast_h323.h"
#include "caps_h323.h" #include "caps_h323.h"
#define DEFINE_G711_CAPABILITY(cls, code, capName) \ #define DEFINE_G711_CAPABILITY(cls, code, capName) \

4
channels/h323/compat_h323.h
View File

@@ -52,7 +52,7 @@ template <class _Abstract_T, typename _Key_T = PString>
class MyPFactory: public PFactory<_Abstract_T, _Key_T> class MyPFactory: public PFactory<_Abstract_T, _Key_T>
{ {
public: public:
template <class _Contrete_T> class Worker: public PFactory<_Abstract_T, _Key_T>::WorkerBase template <class _Concrete_T> class Worker: public PFactory<_Abstract_T, _Key_T>::WorkerBase
{ {
public: public:
Worker(const _Key_T &_key, bool singleton = false) Worker(const _Key_T &_key, bool singleton = false)
@@ -64,6 +64,8 @@ public:
{ {
PFactory<_Abstract_T, _Key_T>::Unregister(key); PFactory<_Abstract_T, _Key_T>::Unregister(key);
} }
protected:
virtual _Abstract_T *Create(const _Key_T &) const { return new _Concrete_T; }
private: private:
PString key; PString key;