revision 3255 does not compile

raffael at kth.se raffael at kth.se
Thu Apr 19 13:42:07 CEST 2007


Hello,

when trying to compile the revision 3255 of the trunk, i found a couple of
error messages. These resulted from the change of ConfBackend.h and
ConfBackend.cxx. I changed the definitions in the actual implementations
of the backends. Since I do not have a svn account, I post the patch on
the newsgroup.

Index: libminisip/include/libminisip/signaling/sip/SipDialogConfVoip.h
===================================================================
--- libminisip/include/libminisip/signaling/sip/SipDialogConfVoip.h    
(revision 3255)
+++ libminisip/include/libminisip/signaling/sip/SipDialogConfVoip.h    
(working copy)
@@ -43,6 +43,7 @@
 #include<libmsip/SipResponse.h>

 #include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/conference/ConfMessageRouter.h>

 class Session;
 class SipDialogContainer;
Index: libminisip/source/subsystem_config/MXmlConfBackend.h
===================================================================
--- libminisip/source/subsystem_config/MXmlConfBackend.h        (revision
3255)
+++ libminisip/source/subsystem_config/MXmlConfBackend.h        (working
copy)
@@ -67,7 +67,7 @@
                 *              configuration is stored on server instead
                 *              of on the local device.
                 */
-               virtual MRef<ConfBackend *> createBackend(MRef<Gui*> gui,
const std::string &configFilePath=NULL)const;
+               virtual MRef<ConfBackend *> createBackend(const
std::string &configFilePath=NULL)const;

                virtual std::string getMemObjectType() const { return
"MXmlConfBackend"; }

Index: libminisip/source/subsystem_config/OnlineMXmlConfBackend.cxx
===================================================================
--- libminisip/source/subsystem_config/OnlineMXmlConfBackend.cxx       
(revision 3255)
+++ libminisip/source/subsystem_config/OnlineMXmlConfBackend.cxx       
(working copy)
@@ -255,7 +255,7 @@
 OnlineMXmlConfigPlugin::OnlineMXmlConfigPlugin( MRef<Library *> lib ):
ConfigPlugin( lib ){
 }

-MRef<ConfBackend *> OnlineMXmlConfigPlugin::createBackend(MRef<Gui*> gui,
const string &)const{
+MRef<ConfBackend *> OnlineMXmlConfigPlugin::createBackend(const string
&)const{
        return new OnlineMXmlConfBackend();
 }

Index: libminisip/source/subsystem_config/GConfBackend.cxx
===================================================================
--- libminisip/source/subsystem_config/GConfBackend.cxx (revision 3255)
+++ libminisip/source/subsystem_config/GConfBackend.cxx (working copy)
@@ -243,7 +243,7 @@
 GConfigPlugin::GConfigPlugin( MRef<Library *> lib ): ConfigPlugin( lib ){
 }

-MRef<ConfBackend *> GConfigPlugin::createBackend(MRef<Gui*> gui, const
string & /*arg*/)const{
+MRef<ConfBackend *> GConfigPlugin::createBackend(const string &
/*arg*/)const{
        return new GConfBackend();
 }

Index: libminisip/source/subsystem_config/OnlineMXmlConfBackend.h
===================================================================
--- libminisip/source/subsystem_config/OnlineMXmlConfBackend.h  (revision
3255)
+++ libminisip/source/subsystem_config/OnlineMXmlConfBackend.h  (working
copy)
@@ -76,7 +76,7 @@
                 *              of on the local device.
                 * @param arg   Currently not used by this backend.
                 */
-               virtual MRef<ConfBackend *> createBackend(MRef<Gui*> gui,
const std::string &arg=NULL)const;
+               virtual MRef<ConfBackend *> createBackend(Mconst
std::string &arg=NULL)const;

                virtual std::string getMemObjectType() const { return
"OnlineMXmlConfigPlugin"; }

Index: libminisip/source/subsystem_config/GConfBackend.h
===================================================================
--- libminisip/source/subsystem_config/GConfBackend.h   (revision 3255)
+++ libminisip/source/subsystem_config/GConfBackend.h   (working copy)
@@ -75,7 +75,7 @@
                 *              of on the local device.
                 * @param arg   Not used by this backend.
                 */
-               virtual MRef<ConfBackend *> createBackend(MRef<Gui*> gui,
const std::string &arg)const;
+               virtual MRef<ConfBackend *> createBackend(const
std::string &arg)const;

                virtual std::string getMemObjectType() const { return
"GConfBackend"; }

Index: libminisip/source/subsystem_config/MXmlConfBackend.cxx
===================================================================
--- libminisip/source/subsystem_config/MXmlConfBackend.cxx      (revision
3255)
+++ libminisip/source/subsystem_config/MXmlConfBackend.cxx      (working
copy)
@@ -162,7 +162,7 @@
 MXmlConfigPlugin::MXmlConfigPlugin( MRef<Library *> lib ): ConfigPlugin(
lib ){
 }

-MRef<ConfBackend *> MXmlConfigPlugin::createBackend(MRef<Gui*> gui, const
string &configPath)const{
+MRef<ConfBackend *> MXmlConfigPlugin::createBackend(const string
&configPath)const{
        return new MXmlConfBackend(configPath);
 }

Index: libminisip/source/Minisip.cxx
===================================================================
--- libminisip/source/Minisip.cxx       (revision 3255)
+++ libminisip/source/Minisip.cxx       (working copy)
@@ -465,7 +465,7 @@
                        mout << BOLD << "init 3/9: Parsing configuration"
<< PLAIN << end;
 #endif
                        MRef<ConfBackend *> confBackend =
-                       ConfigRegistry::getInstance()->createBackend( gui,
confPath);
+                      
ConfigRegistry::getInstance()->createBackend(confPath);
                        if( !confBackend ){
                                merr << "Minisip could not load a
configuration" << end <<
                                        "back end. The application will
now" << end <<




More information about the Minisip-devel mailing list