mirror of https://github.com/sipwise/sems.git
parent
0b43fc69af
commit
11cdf71dd6
@ -0,0 +1,45 @@
|
||||
From 73490566761bb0fb09a6ebd74566d7f2b789c62f Mon Sep 17 00:00:00 2001
|
||||
From: Raphael Coeffic <rco@iptel.org>
|
||||
Date: Tue, 20 Nov 2012 15:33:35 +0100
|
||||
Subject: [PATCH] c/f: correcting some strange scope issues encountered with
|
||||
GCC & clang on osx.
|
||||
|
||||
---
|
||||
apps/ivr/Ivr.cpp | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/apps/ivr/Ivr.cpp b/apps/ivr/Ivr.cpp
|
||||
index b84afa7..a4d74c3 100644
|
||||
--- a/apps/ivr/Ivr.cpp
|
||||
+++ b/apps/ivr/Ivr.cpp
|
||||
@@ -41,7 +41,9 @@
|
||||
#include <dirent.h>
|
||||
|
||||
#include <set>
|
||||
+#include <string>
|
||||
using std::set;
|
||||
+using std::string;
|
||||
|
||||
|
||||
#define PYFILE_REGEX "(.+)\\.(py|pyc|pyo)$"
|
||||
@@ -439,7 +441,7 @@ int IvrFactory::onLoad()
|
||||
|
||||
DBG("directory '%s' opened\n",script_path.c_str());
|
||||
|
||||
- set<string> unique_entries;
|
||||
+ std::set<string> unique_entries;
|
||||
regmatch_t pmatch[2];
|
||||
|
||||
struct dirent* entry=0;
|
||||
@@ -457,7 +459,7 @@ int IvrFactory::onLoad()
|
||||
regfree(®);
|
||||
|
||||
AmPlugIn* plugin = AmPlugIn::instance();
|
||||
- for(set<string>::iterator it = unique_entries.begin();
|
||||
+ for(std::set<string>::iterator it = unique_entries.begin();
|
||||
it != unique_entries.end(); it++) {
|
||||
|
||||
if(loadScript(*it)){
|
||||
--
|
||||
2.0.0
|
||||
|
||||
Loading…
Reference in new issue