diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2014-02-24 09:02:44 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2014-02-24 09:02:44 +0000 |
| commit | e36b19cb22fb5b57e7c584defb33c3f5c258ea3c (patch) | |
| tree | 92a63e399543634732b1373b4ac6346077f27a3c /pjsip | |
| parent | 9fbfd6ab5526baa0980fd32cb2406728a0c1e801 (diff) | |
Re #1680: Fixed compile warnings on VS2005 for x64/win64 config.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4761 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/src/pjsua2/json.cpp | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsua2/siptypes.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pjsip/src/pjsua2/json.cpp b/pjsip/src/pjsua2/json.cpp index afa25989..7c16e2d8 100644 --- a/pjsip/src/pjsua2/json.cpp +++ b/pjsip/src/pjsua2/json.cpp @@ -180,7 +180,7 @@ void JsonDocument::loadString(const string &input) throw(Error) PJSUA2_RAISE_ERROR3(PJ_EINVALIDOP, "JsonDocument.loadString()", "Document already initialized"); - unsigned size = input.size(); + unsigned size = (unsigned)input.size(); char *buffer = (char*)pj_pool_alloc(pool, size+1); unsigned parse_size = (unsigned)size; pj_json_err_info err_info; diff --git a/pjsip/src/pjsua2/siptypes.cpp b/pjsip/src/pjsua2/siptypes.cpp index f1d8bf2b..aca1f78b 100644 --- a/pjsip/src/pjsua2/siptypes.cpp +++ b/pjsip/src/pjsua2/siptypes.cpp @@ -163,7 +163,7 @@ pjsip_tls_setting TlsConfig::toPj() const ts.privkey_file = str2Pj(this->privKeyFile); ts.password = str2Pj(this->password); ts.method = this->method; - ts.ciphers_num = this->ciphers.size(); + ts.ciphers_num = (unsigned)this->ciphers.size(); // The following will only work if sizeof(enum)==sizeof(int) pj_assert(sizeof(ts.ciphers[0]) == sizeof(int)); ts.ciphers = ts.ciphers_num? @@ -424,7 +424,7 @@ pjsip_multipart_part& SipMultipartPart::toPj() const pjMsgBody.print_body = &pjsip_print_text_body; pjMsgBody.clone_data = &pjsip_clone_text_data; pjMsgBody.data = (void*)body.c_str(); - pjMsgBody.len = body.size(); + pjMsgBody.len = (unsigned)body.size(); pjMpp.body = &pjMsgBody; return pjMpp; |