0002-fix-template-whitespace-syntax.patch 3.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475
  1. From 546e89a29a82cc4f7de6c99be5a07221aa7443df Mon Sep 17 00:00:00 2001
  2. From: Adam Duskett <aduskett@gmail.com>
  3. Date: Fri, 9 Mar 2018 08:09:52 -0500
  4. Subject: [PATCH] fix template whitespace syntax
  5. Some files don't have a space inbetween the '<' and '::' charachters, which
  6. will cause build failures on older toolchains. Adding a space inbetween these
  7. two characters fixes the issue.
  8. upstream-status: pending
  9. https://github.com/Microsoft/cpprestsdk/pull/715
  10. Signed-off-by: Adam Duskett <aduskett@gmail.com>
  11. ---
  12. Release/include/cpprest/details/web_utilities.h | 2 +-
  13. Release/include/cpprest/http_client.h | 2 +-
  14. Release/include/cpprest/json.h | 2 +-
  15. Release/include/cpprest/ws_client.h | 2 +-
  16. 4 files changed, 4 insertions(+), 4 deletions(-)
  17. diff --git a/Release/include/cpprest/details/web_utilities.h b/Release/include/cpprest/details/web_utilities.h
  18. index ba641654..9855c315 100644
  19. --- a/Release/include/cpprest/details/web_utilities.h
  20. +++ b/Release/include/cpprest/details/web_utilities.h
  21. @@ -33,7 +33,7 @@ class zero_memory_deleter
  22. public:
  23. _ASYNCRTIMP void operator()(::utility::string_t *data) const;
  24. };
  25. -typedef std::unique_ptr<::utility::string_t, zero_memory_deleter> plaintext_string;
  26. +typedef std::unique_ptr< ::utility::string_t, zero_memory_deleter> plaintext_string;
  27. #if defined(_WIN32) && !defined(CPPREST_TARGET_XP)
  28. #if defined(__cplusplus_winrt)
  29. diff --git a/Release/include/cpprest/http_client.h b/Release/include/cpprest/http_client.h
  30. index a936a23e..f5ad8fac 100644
  31. --- a/Release/include/cpprest/http_client.h
  32. +++ b/Release/include/cpprest/http_client.h
  33. @@ -757,7 +757,7 @@ public:
  34. private:
  35. - std::shared_ptr<::web::http::client::http_pipeline> m_pipeline;
  36. + std::shared_ptr< ::web::http::client::http_pipeline> m_pipeline;
  37. };
  38. namespace details {
  39. diff --git a/Release/include/cpprest/json.h b/Release/include/cpprest/json.h
  40. index 07c54502..dfdeead4 100644
  41. --- a/Release/include/cpprest/json.h
  42. +++ b/Release/include/cpprest/json.h
  43. @@ -301,7 +301,7 @@ public:
  44. /// <param name="fields">Field names associated with JSON values</param>
  45. /// <param name="keep_order">Whether to preserve the original order of the fields</param>
  46. /// <returns>A non-empty JSON object value</returns>
  47. - static _ASYNCRTIMP json::value __cdecl object(std::vector<std::pair<::utility::string_t, value>> fields, bool keep_order = false);
  48. + static _ASYNCRTIMP json::value __cdecl object(std::vector<std::pair< ::utility::string_t, value>> fields, bool keep_order = false);
  49. /// <summary>
  50. /// Creates an empty JSON array
  51. diff --git a/Release/include/cpprest/ws_client.h b/Release/include/cpprest/ws_client.h
  52. index 9a324cde..98f933e1 100644
  53. --- a/Release/include/cpprest/ws_client.h
  54. +++ b/Release/include/cpprest/ws_client.h
  55. @@ -184,7 +184,7 @@ public:
  56. /// <returns>Vector of all the subprotocols </returns>
  57. /// <remarks>If you want all the subprotocols in a comma separated string
  58. /// they can be directly looked up in the headers using 'Sec-WebSocket-Protocol'.</remarks>
  59. - _ASYNCRTIMP std::vector<::utility::string_t> subprotocols() const;
  60. + _ASYNCRTIMP std::vector< ::utility::string_t> subprotocols() const;
  61. /// <summary>
  62. /// Gets the server certificate validation property.
  63. --
  64. 2.14.3