david_david

pokerth-1.1.1-mga-fix-Qt-5.6.0-compile.patch

Feb 20th, 2016
285
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.03 KB | None | 0 0
  1. --- PokerTH-1.1.1-src.orig/src/third_party/websocketpp/websocketpp/error.hpp 2014-01-10 22:18:21.010643100 +0100
  2. +++ PokerTH-1.1.1-src/src/third_party/websocketpp/websocketpp/error.hpp 2016-02-19 11:33:10.000000000 +0100
  3. @@ -33,6 +33,10 @@
  4. #include <websocketpp/common/cpp11.hpp>
  5. #include <websocketpp/common/system_error.hpp>
  6.  
  7. +#if __cplusplus == 199711L
  8. +# define noexcept
  9. +#endif
  10. +
  11. namespace websocketpp {
  12.  
  13. /// Combination error code / string type for returning two values
  14. @@ -122,7 +126,7 @@
  15. public:
  16. category() {}
  17.  
  18. - char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
  19. + char const * name() const noexcept _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
  20. return "websocketpp";
  21. }
  22.  
  23. --- PokerTH-1.1.1-src.orig/src/third_party/websocketpp/websocketpp/transport/base/connection.hpp 2014-01-10 22:18:21.016643100 +0100
  24. +++ PokerTH-1.1.1-src/src/third_party/websocketpp/websocketpp/transport/base/connection.hpp 2016-02-19 11:31:56.000000000 +0100
  25. @@ -34,6 +34,10 @@
  26. #include <websocketpp/common/memory.hpp>
  27. #include <websocketpp/common/system_error.hpp>
  28.  
  29. +#if __cplusplus == 199711L
  30. +# define noexcept
  31. +#endif
  32. +
  33. namespace websocketpp {
  34. /// Transport policies provide network connectivity and timers
  35. /**
  36. @@ -179,7 +183,7 @@
  37. public:
  38. category() {}
  39.  
  40. - char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
  41. + char const * name() const noexcept _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
  42. return "websocketpp.transport";
  43. }
  44.  
  45. --- PokerTH-1.1.1-src.orig/src/third_party/websocketpp/websocketpp/transport/iostream/base.hpp 2014-01-10 22:18:21.016643100 +0100
  46. +++ PokerTH-1.1.1-src/src/third_party/websocketpp/websocketpp/transport/iostream/base.hpp 2016-02-19 11:30:51.000000000 +0100
  47. @@ -33,6 +33,10 @@
  48.  
  49. #include <string>
  50.  
  51. +#if __cplusplus == 199711L
  52. +# define noexcept
  53. +#endif
  54. +
  55. namespace websocketpp {
  56. namespace transport {
  57. /// Transport policy that uses STL iostream for I/O and does not support timers
  58. @@ -64,7 +68,7 @@
  59. public:
  60. category() {}
  61.  
  62. - char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
  63. + char const * name() const noexcept _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
  64. return "websocketpp.transport.iostream";
  65. }
  66.  
  67. --- PokerTH-1.1.1-src.orig/src/third_party/websocketpp/websocketpp/extensions/extension.hpp 2014-01-10 22:18:21.010643100 +0100
  68. +++ PokerTH-1.1.1-src/src/third_party/websocketpp/websocketpp/extensions/extension.hpp 2016-02-19 11:29:40.000000000 +0100
  69. @@ -34,6 +34,10 @@
  70. #include <string>
  71. #include <vector>
  72.  
  73. +#if __cplusplus == 199711L
  74. +# define noexcept
  75. +#endif
  76. +
  77. namespace websocketpp {
  78.  
  79. /**
  80. @@ -62,7 +66,7 @@
  81. public:
  82. category() {}
  83.  
  84. - const char *name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
  85. + const char *name() const noexcept _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
  86. return "websocketpp.extension";
  87. }
  88.  
  89. --- PokerTH-1.1.1-src.orig/src/third_party/websocketpp/websocketpp/transport/asio/base.hpp 2014-01-10 22:18:21.015643100 +0100
  90. +++ PokerTH-1.1.1-src/src/third_party/websocketpp/websocketpp/transport/asio/base.hpp 2016-02-19 11:28:48.000000000 +0100
  91. @@ -40,6 +40,10 @@
  92.  
  93. #include <string>
  94.  
  95. +#if __cplusplus == 199711L
  96. +# define noexcept
  97. +#endif
  98. +
  99. namespace websocketpp {
  100. namespace transport {
  101. /// Transport policy that uses boost::asio
  102. @@ -202,7 +206,7 @@
  103. /// Asio transport error category
  104. class category : public lib::error_category {
  105. public:
  106. - char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
  107. + char const * name() const noexcept _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
  108. return "websocketpp.transport.asio";
  109. }
  110.  
  111. --- PokerTH-1.1.1-src.orig/src/third_party/websocketpp/websocketpp/transport/asio/security/base.hpp 2014-01-10 22:18:21.016643100 +0100
  112. +++ PokerTH-1.1.1-src/src/third_party/websocketpp/websocketpp/transport/asio/security/base.hpp 2016-02-19 11:26:24.000000000 +0100
  113. @@ -39,6 +39,10 @@
  114. #include <iostream>
  115. #include <string>
  116.  
  117. +#if __cplusplus == 199711L
  118. +# define noexcept
  119. +#endif
  120. +
  121. // Interface that sockets/security policies must implement
  122.  
  123. /*
  124. @@ -102,7 +106,7 @@
  125. /// Error category related to asio transport socket policies
  126. class socket_category : public lib::error_category {
  127. public:
  128. - const char *name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
  129. + const char *name() const noexcept _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
  130. return "websocketpp.transport.asio.socket";
  131. }
  132.  
  133. --- PokerTH-1.1.1-src.orig/src/third_party/websocketpp/websocketpp/processors/base.hpp 2014-01-10 22:18:21.013643100 +0100
  134. +++ PokerTH-1.1.1-src/src/third_party/websocketpp/websocketpp/processors/base.hpp 2016-02-19 11:26:00.000000000 +0100
  135. @@ -38,6 +38,10 @@
  136. #include <map>
  137. #include <string>
  138.  
  139. +#if __cplusplus == 199711L
  140. +# define noexcept
  141. +#endif
  142. +
  143. namespace websocketpp {
  144. namespace processor {
  145.  
  146. @@ -159,7 +163,7 @@
  147. public:
  148. processor_category() {}
  149.  
  150. - char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
  151. + char const * name() const noexcept _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
  152. return "websocketpp.processor";
  153. }
Advertisement
Add Comment
Please, Sign In to add comment