aboutsummaryrefslogtreecommitdiffstats
path: root/channels/h323
diff options
context:
space:
mode:
authorpcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-25 06:15:24 +0000
committerpcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-25 06:15:24 +0000
commitb2750d7938a27a1ebcaf2be3c8b85d4a844eb978 (patch)
tree82d711b1dd3d90f470dd06ab77248156d5aedd3e /channels/h323
parent77f30cd6e7f86f6b31790885573d433223f47a23 (diff)
Merged revisions 43472,43495 from trunk
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@43582 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/h323')
-rw-r--r--channels/h323/caps_h323.cxx2
-rw-r--r--channels/h323/compat_h323.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/channels/h323/caps_h323.cxx b/channels/h323/caps_h323.cxx
index 7e9420691..a420825a3 100644
--- a/channels/h323/caps_h323.cxx
+++ b/channels/h323/caps_h323.cxx
@@ -1,5 +1,7 @@
#include <ptlib.h>
#include <h323.h>
+#include <h245.h>
+#include "ast_h323.h"
#include "caps_h323.h"
#define DEFINE_G711_CAPABILITY(cls, code, capName) \
diff --git a/channels/h323/compat_h323.h b/channels/h323/compat_h323.h
index 2ea640c4a..63da8ac8c 100644
--- a/channels/h323/compat_h323.h
+++ b/channels/h323/compat_h323.h
@@ -52,7 +52,7 @@ template <class _Abstract_T, typename _Key_T = PString>
class MyPFactory: public PFactory<_Abstract_T, _Key_T>
{
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:
Worker(const _Key_T &_key, bool singleton = false)
@@ -64,6 +64,8 @@ public:
{
PFactory<_Abstract_T, _Key_T>::Unregister(key);
}
+ protected:
+ virtual _Abstract_T *Create(const _Key_T &) const { return new _Concrete_T; }
private:
PString key;