some more fixes for SEMS on Solaris

contributed by Richard Newman rnewman at twinql dot com


git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@634 8eb893ce-cfd4-0310-b710-fb5ebe64c474

apps/callback/CallBack.cpp

@@ -181,7 +181,7 @@ void CallBackFactory::run() {
     vector<string> todo;
     time_t now;
     time(&now);
-    multimap<time_t, string>::iterator it = 
+    std::multimap<time_t, string>::iterator it = 
       scheduled_calls.begin();
     while (it != scheduled_calls.end()) {
       if (it->first > now)

apps/callback/CallBack.h

@@ -57,7 +57,7 @@ class CallBackFactory
 
   regex_t accept_caller_re;
 
-  multimap<time_t, string> scheduled_calls;
+  std::multimap<time_t, string> scheduled_calls;
   AmMutex scheduled_calls_mut;
   // seconds to wait before calling back
   int cb_wait;

apps/ivr/Ivr.h

@@ -101,7 +101,7 @@ class IvrFactory: public AmSessionFactory
 
   IvrDialog* newDlg(const string& name);
 
-  queue<PyObject*> deferred_threads;
+  std::queue<PyObject*> deferred_threads;
   void start_deferred_threads();
    
  public:

apps/sw_prepaid_sip/SWPrepaidSIP.cpp

@@ -184,7 +184,7 @@ void SWPrepaidSIPDialog::onInvite(const AmSipRequest& req)
 
     invite_req = req;
     dlg.updateStatus(req);
-    recvd_req.insert(make_pair(req.cseq,req));
+    recvd_req.insert(std::make_pair(req.cseq,req));
 
     connectCallee("<" + m_ruri + ">", m_proxy + ";sw_prepaid", true);
     sip_relay_only = true;

apps/voicemail/AnswerMachine.cpp

@@ -483,7 +483,7 @@ AmSession* AnswerMachineFactory::onInvite(const AmSipRequest& req)
   if(email.empty())
     throw AmSession::Exception(404,"missing email address");
 
-  map<string,EmailTemplate>::iterator tmpl_it;
+  std::map<string,EmailTemplate>::iterator tmpl_it;
   if (!language.empty()) {
     tmpl_it = email_tmpl.find(req.domain + "_" + language);
     if(tmpl_it == email_tmpl.end()) {

apps/voicemail/AnswerMachine.h

@@ -46,7 +46,7 @@ class AmMail;
 /** \brief Factory for voicemail sessions */
 class AnswerMachineFactory: public AmSessionFactory
 {
-  map<string, EmailTemplate> email_tmpl;
+  std::map<string, EmailTemplate> email_tmpl;
 
   int getEmailAddress();
 

apps/webconference/WebConference.cpp

@@ -129,7 +129,7 @@ int WebConferenceFactory::onLoad()
 
   string feedback_filename = cfg.getParameter("feedback_file");
   if (!feedback_filename.empty()) {
-    feedback_file.open(feedback_filename.c_str(), ios::out);
+    feedback_file.open(feedback_filename.c_str(), std::ios::out);
     if (!feedback_file.good()) {
       ERROR("opening feedback file '%s'\n", 
 	    feedback_filename.c_str());
@@ -514,7 +514,7 @@ void WebConferenceFactory::resetFeedback(const AmArg& args, AmArg& ret) {
 
   feedback_file.close();
   if (!feedback_filename.empty()) {
-    feedback_file.open(feedback_filename.c_str(), ios::out);
+    feedback_file.open(feedback_filename.c_str(), std::ios::out);
     if (!feedback_file.good()) {
       ERROR("opening new feedback file '%s'\n", 
 	    feedback_filename.c_str());