Re #1881: Fixed compile warnings on VS2015 about declaration hides previous declaration.

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5170 74dad513-b988-da41-8d7b-12977e46ad98

3 files changed, 14 insertions, 14 deletions

diff --git a/pjsip/src/pjsua2/call.cpp b/pjsip/src/pjsua2/call.cpp
index f0bba738..ab6fdda7 100644
--- a/pjsip/src/pjsua2/call.cpp
+++ b/pjsip/src/pjsua2/call.cpp
@@ -152,9 +152,9 @@ public:
 };
 
 
-void CallAudioMedia::setPortId(int id)
+void CallAudioMedia::setPortId(int pid)
 {
-    this->id = id;
+    this->id = pid;
 }
 
 CallOpParam::CallOpParam(bool useDefaultCallSetting)
diff --git a/pjsip/src/pjsua2/media.cpp b/pjsip/src/pjsua2/media.cpp
index b6b73ea3..5a4e6ad0 100644
--- a/pjsip/src/pjsua2/media.cpp
+++ b/pjsip/src/pjsua2/media.cpp
@@ -1511,7 +1511,7 @@ void VidCodecParam::fromPj(const pjmedia_vid_codec_param &param)
 {
     dir = param.dir;
     packing = param.packing;
-    ignoreFmtp = param.ignore_fmtp;
+    ignoreFmtp = param.ignore_fmtp != PJ_FALSE;
     encMtu = param.enc_mtu;
     encFmt.fromPj(param.enc_fmt);
     decFmt.fromPj(param.dec_fmt);
diff --git a/pjsip/src/pjsua2/siptypes.cpp b/pjsip/src/pjsua2/siptypes.cpp
index a3391bbc..e2498cab 100644
--- a/pjsip/src/pjsua2/siptypes.cpp
+++ b/pjsip/src/pjsua2/siptypes.cpp
@@ -304,24 +304,24 @@ void TransportConfig::writeObject(ContainerNode &node) const throw(Error)
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void TransportInfo::fromPj(const pjsua_transport_info &info)
+void TransportInfo::fromPj(const pjsua_transport_info &tinfo)
 {
-    this->id = info.id;
-    this->type = info.type;
-    this->typeName = pj2Str(info.type_name);
-    this->info = pj2Str(info.info);
-    this->flags = info.flag;
+    this->id = tinfo.id;
+    this->type = tinfo.type;
+    this->typeName = pj2Str(tinfo.type_name);
+    this->info = pj2Str(tinfo.info);
+    this->flags = tinfo.flag;
 
     char straddr[PJ_INET6_ADDRSTRLEN+10];
-    pj_sockaddr_print(&info.local_addr, straddr, sizeof(straddr), 3);
+    pj_sockaddr_print(&tinfo.local_addr, straddr, sizeof(straddr), 3);
     this->localAddress = straddr;
 
     pj_ansi_snprintf(straddr, sizeof(straddr), "%.*s:%d",
-                     (int)info.local_name.host.slen,
-                     info.local_name.host.ptr,
-                     info.local_name.port);
+                     (int)tinfo.local_name.host.slen,
+                     tinfo.local_name.host.ptr,
+                     tinfo.local_name.port);
     this->localName = straddr;
-    this->usageCount = info.usage_count;
+    this->usageCount = tinfo.usage_count;
 }
 
 ///////////////////////////////////////////////////////////////////////////////