0001-Fix-some-issue-compiling-with-Visual-Studio.patch 5.0 KB

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