MT#7347 fix broken build (scope issues with GCC).

(cherry picked from commit 5fab0995dd)
mr3.3.1
Andrew Pogrebennyk 12 years ago
parent 0b43fc69af
commit 11cdf71dd6

@ -125,4 +125,5 @@ sipwise/0001-fix-sems-process-returns-always-0-when-daemonized.patch
sipwise/0002-core-fix-return-status-pipe-machinery-in-non-daemon-.patch
sipwise/0123-MT-6475-check-method-ACK-or-PRACK-before-deleting-tr.patch
sipwise/0124-added-reference-counting-to-plug-in-interfaces.patch
sipwise/0125-c-f-correcting-some-strange-scope-issues-encountered.patch
no_config.patch

@ -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(&reg);
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…
Cancel
Save