1From be76b10a50749e2e11dce8dcc38b414a7f9d8747 Mon Sep 17 00:00:00 2001 2From: Ben Walden <bwalden@redboxvoice.com> 3Date: Sat, 22 Aug 2020 23:14:11 +0100 4Subject: [PATCH] Fix some issue compiling with Visual Studio 16.7.0 and tidy 5 up Visual Studio 16 project files 6 7Upstream: https://github.com/resiprocate/resiprocate/commit/be76b10a50749e2e11dce8dcc38b414a7f9d8747 8[Retrieved (and updated to keep only RendKa.cxx update)] 9Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 10--- 11 VisualStudioReadme.htm | 65 + 12 contrib/GeoIP/GeoIP_12_0.vcxproj | 550 ------- 13 contrib/GeoIP/GeoIP_16_0.vcxproj | 93 +- 14 .../db/build_windows/db_static_12_0.vcxproj | 1260 ----------------- 15 .../db/build_windows/db_static_16_0.vcxproj | 696 +-------- 16 contrib/db/dbinc/atomic.h | 4 +- 17 contrib/db/mp/mp_fget.c | 4 +- 18 contrib/db/mp/mp_mvcc.c | 4 +- 19 contrib/db/mp/mp_region.c | 4 +- 20 contrib/db/mutex/mut_method.c | 2 +- 21 contrib/pcre/pcre_12_0.vcxproj | 466 ------ 22 contrib/pcre/pcre_16_0.vcxproj | 159 +-- 23 contrib/popt/popt_12_0.vcxproj | 394 ------ 24 contrib/popt/popt_16_0.vcxproj | 120 +- 25 reSIProcate_16_0.sln | 58 +- 26 .../queuetostream_12_0.vcxproj | 582 -------- 27 .../queuetostream_16_0.vcxproj | 207 ++- 28 repro/repro_12_0.vcxproj | 825 ----------- 29 repro/repro_12_0.vcxproj.filters | 47 - 30 repro/repro_16_0.vcxproj | 159 ++- 31 repro/reprocmd/reprocmd_12_0.vcxproj | 597 -------- 32 repro/reprocmd/reprocmd_16_0.vcxproj | 139 +- 33 repro/reprolib_12_0.vcxproj | 596 -------- 34 repro/reprolib_12_0.vcxproj.filters | 136 -- 35 repro/reprolib_16_0.vcxproj | 132 +- 36 resip/dum/dum_12_0.vcxproj | 615 -------- 37 resip/dum/dum_16_0.vcxproj | 124 +- 38 resip/dum/test/basicCall_12_0.vcxproj | 621 -------- 39 resip/dum/test/basicCall_16_0.vcxproj | 145 +- 40 resip/dum/test/basicClient_12_0.vcxproj | 653 --------- 41 resip/dum/test/basicClient_16_0.vcxproj | 158 +-- 42 resip/dum/test/basicMessage_12_0.vcxproj | 615 -------- 43 resip/dum/test/basicMessage_16_0.vcxproj | 141 +- 44 resip/dum/test/basicRegister_12_0.vcxproj | 615 -------- 45 resip/dum/test/basicRegister_16_0.vcxproj | 137 +- 46 resip/rend/RendKa.cxx | 2 +- 47 resip/rend/rend_12_0.vcxproj | 352 ----- 48 resip/rend/rend_16_0.vcxproj | 89 +- 49 resip/stack/resiprocate_12_0.vcxproj | 873 ------------ 50 resip/stack/resiprocate_12_0.vcxproj.filters | 351 ----- 51 resip/stack/resiprocate_16_0.vcxproj | 165 ++- 52 resip/stack/test/test_12_0.vcxproj | 627 -------- 53 resip/stack/test/test_16_0.vcxproj | 171 ++- 54 rutil/dns/ares/ares_12_0.vcxproj | 488 ------- 55 rutil/dns/ares/ares_12_0.vcxproj.filters | 34 - 56 rutil/dns/ares/ares_16_0.vcxproj | 159 +-- 57 rutil/rutil_12_0.vcxproj | 604 -------- 58 rutil/rutil_16_0.vcxproj | 153 +- 59 48 files changed, 1409 insertions(+), 13782 deletions(-) 60 delete mode 100644 contrib/GeoIP/GeoIP_12_0.vcxproj 61 delete mode 100644 contrib/db/build_windows/db_static_12_0.vcxproj 62 delete mode 100644 contrib/pcre/pcre_12_0.vcxproj 63 delete mode 100644 contrib/popt/popt_12_0.vcxproj 64 delete mode 100644 repro/accountingconsumers/queuetostream_12_0.vcxproj 65 delete mode 100644 repro/repro_12_0.vcxproj 66 delete mode 100644 repro/repro_12_0.vcxproj.filters 67 delete mode 100644 repro/reprocmd/reprocmd_12_0.vcxproj 68 delete mode 100644 repro/reprolib_12_0.vcxproj 69 delete mode 100644 repro/reprolib_12_0.vcxproj.filters 70 delete mode 100644 resip/dum/dum_12_0.vcxproj 71 delete mode 100644 resip/dum/test/basicCall_12_0.vcxproj 72 delete mode 100644 resip/dum/test/basicClient_12_0.vcxproj 73 delete mode 100644 resip/dum/test/basicMessage_12_0.vcxproj 74 delete mode 100644 resip/dum/test/basicRegister_12_0.vcxproj 75 delete mode 100644 resip/rend/rend_12_0.vcxproj 76 delete mode 100644 resip/stack/resiprocate_12_0.vcxproj 77 delete mode 100644 resip/stack/resiprocate_12_0.vcxproj.filters 78 delete mode 100644 resip/stack/test/test_12_0.vcxproj 79 delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj 80 delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj.filters 81 delete mode 100644 rutil/rutil_12_0.vcxproj 82 83diff --git a/resip/rend/RendKa.cxx b/resip/rend/RendKa.cxx 84index 8645f17636..8321ada1ee 100644 85--- a/resip/rend/RendKa.cxx 86+++ b/resip/rend/RendKa.cxx 87@@ -66,7 +66,7 @@ bool operator<(const RendKaAssoc& a, const RendKaAssoc& b) 88 89 struct RendKaConn 90 { 91- bool operator() (const RendKaAssocPtr& a, const RendKaAssocPtr& b) 92+ bool operator()(const RendKaAssocPtr& a, const RendKaAssocPtr& b) const 93 { 94 return *a < *b; 95 } 96