Changeset 4897

Timestamp:

Aug 21, 2014 3:33:36 AM (10 years ago)

Author:

nanang

Message:

Misc (re #1751): Fixed miscellaneous MSVC warnings.

Location:

pjproject/trunk/pjsip/src

Files:

• pjsua-lib/pjsua_acc.c (modified) (1 diff)
• pjsua2/media.cpp (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -3086 +3086 @@
         if (status == PJ_SUCCESS) {
             int addr_len = pj_sockaddr_get_len(&ai.ai_addr);
-            pj_uint16_t port = dinfo.addr.port;
+            pj_uint16_t port = (pj_uint16_t)dinfo.addr.port;
 
             if (port==0) {

pjproject/trunk/pjsip/src/pjsua2/media.cpp

@@ -371 +371 @@
                                      void *usr_data)
 {
+    PJ_UNUSED_ARG(port);
     AudioMediaPlayer *player = (AudioMediaPlayer*)usr_data;
     return player->onEof() ? PJ_SUCCESS : PJ_EEOF;
@@ -577 +578 @@
     for (i=0; i<digitMap.count; ++i) {
         digitMap.digits[i].digit = digit_map[i].digit.c_str()[0];
-        digitMap.digits[i].freq1 = digit_map[i].freq1;
-        digitMap.digits[i].freq2 = digit_map[i].freq2;
+        digitMap.digits[i].freq1 = (short)digit_map[i].freq1;
+        digitMap.digits[i].freq2 = (short)digit_map[i].freq2;
     }