From 5796526ad4369c1096495c646e849956c5e222ea Mon Sep 17 00:00:00 2001
From: Michael Prokop <mprokop@sipwise.com>
Date: Thu, 17 Nov 2016 15:51:08 +0100
Subject: [PATCH] TT#6431 New patch from upstream addressing C++11 issues

This addresses the build issue against Debian/stretch:

| resolver.cpp: In member function 'bool dns_entry_map::insert(const string&, dns_entry*)':
| resolver.cpp:826:57: error: no matching function for call to 'make_pair(const string&, dns_entry*&)'

Change-Id: Ie3dc6103d46af82a588035669932fb8615ad96b6
---
 debian/patches/series                         |  1 +
 .../patches/upstream/0008-fix-for-c++11.patch | 51 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 debian/patches/upstream/0008-fix-for-c++11.patch

diff --git a/debian/patches/series b/debian/patches/series
index 7a673b47..afc70aa5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@ upstream/0004-core-rtp-stream-take-fmt-params-in-payload-initializ.patch
 upstream/0005-opus-configurable-codec-settings-for-OPUS-codec.patch
 upstream/0006-b-f-fixes-c7800ea-remove-leftover-stacktrace-in-setC.patch
 upstream/0007-b-f-fix-bbb13a1-remove-excessive-debug-info.patch
+upstream/0008-fix-for-c++11.patch
 #
 sipwise/sw_vcs.patch
 sipwise/0006-rename_xdigits.patch
diff --git a/debian/patches/upstream/0008-fix-for-c++11.patch b/debian/patches/upstream/0008-fix-for-c++11.patch
new file mode 100644
index 00000000..fc0c00f4
--- /dev/null
+++ b/debian/patches/upstream/0008-fix-for-c++11.patch
@@ -0,0 +1,51 @@
+From 4b2fc5d117242c659e4df0395c6e12f4fcb75edc Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Fri, 8 Apr 2016 14:50:23 +0300
+Subject: [PATCH] Fix for C++11
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ apps/sbc/RegisterCache.cpp  | 2 +-
+ apps/sbc/RegisterDialog.cpp | 2 +-
+ core/sip/resolver.cpp       | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/apps/sbc/RegisterCache.cpp b/apps/sbc/RegisterCache.cpp
+index cbd3c30..5cd1235 100644
+--- a/apps/sbc/RegisterCache.cpp
++++ b/apps/sbc/RegisterCache.cpp
+@@ -955,7 +955,7 @@ bool _RegisterCache::throttleRegister(RegisterCacheCtx& ctx,
+       return false; // fwd
+     }
+ 
+-    alias_updates.push_back(make_pair<string,long int>(reg_binding.alias,
++    alias_updates.push_back(make_pair(reg_binding.alias,
+ 						       contact_expires));
+   }
+ 
+diff --git a/apps/sbc/RegisterDialog.cpp b/apps/sbc/RegisterDialog.cpp
+index 820e03d..88b94cb 100644
+--- a/apps/sbc/RegisterDialog.cpp
++++ b/apps/sbc/RegisterDialog.cpp
+@@ -239,7 +239,7 @@ int RegisterDialog::fixUacContacts(const AmSipRequest& req)
+ 	continue;
+       }
+ 
+-      alias_updates.push_back(make_pair<string,long int>(reg_binding.alias,
++      alias_updates.push_back(make_pair(reg_binding.alias,
+ 							 contact_expires));
+     }
+ 
+diff --git a/core/sip/resolver.cpp b/core/sip/resolver.cpp
+index 9793069..7bc6ff7 100644
+--- a/core/sip/resolver.cpp
++++ b/core/sip/resolver.cpp
+@@ -823,7 +823,7 @@ dns_entry_map::insert(const dns_entry_map::value_type& x)
+ bool dns_entry_map::insert(const string& key, dns_entry* e)
+ {
+     std::pair<iterator, bool> res =
+-    	insert(make_pair<const key_type&,mapped_type>(key,e));
++	insert(make_pair(key,e));
+ 
+     if(res.second) {
+ 	inc_ref(e);