aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry-Hu <v-daih@microsoft.com>2018-05-31 00:33:33 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2018-05-31 13:52:52 -0700
commit55ed2f6ed8cd11f1918e52889c4dc4d008c1420c (patch)
tree97896c6960a81898ce13b3de596220dd6e467e8d
parent3fc54807cb9b0bf242f8a2e7d1035bdbbd591aac (diff)
downloadvcpkg-55ed2f6ed8cd11f1918e52889c4dc4d008c1420c.tar.gz
vcpkg-55ed2f6ed8cd11f1918e52889c4dc4d008c1420c.zip
Fix warning C4643 in clockutils
-rw-r--r--ports/clockutils/CONTROL2
-rw-r--r--ports/clockutils/fix-warningC4643.patch29
-rw-r--r--ports/clockutils/portfile.cmake5
3 files changed, 35 insertions, 1 deletions
diff --git a/ports/clockutils/CONTROL b/ports/clockutils/CONTROL
index 59950365d..5a3325350 100644
--- a/ports/clockutils/CONTROL
+++ b/ports/clockutils/CONTROL
@@ -1,3 +1,3 @@
Source: clockutils
-Version: 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-1
+Version: 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-2
Description: A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.
diff --git a/ports/clockutils/fix-warningC4643.patch b/ports/clockutils/fix-warningC4643.patch
new file mode 100644
index 000000000..49bc32386
--- /dev/null
+++ b/ports/clockutils/fix-warningC4643.patch
@@ -0,0 +1,29 @@
+diff --git a/include/clockUtils/sockets/TcpSocket.h b/include/clockUtils/sockets/TcpSocket.h
+index 6e0d9c8..3bb97a9 100644
+--- a/include/clockUtils/sockets/TcpSocket.h
++++ b/include/clockUtils/sockets/TcpSocket.h
+@@ -57,9 +57,6 @@
+ #define INVALID_SOCKET -1
+ #endif
+
+-namespace std {
+- class thread;
+-} /* namespace std */
+ namespace clockUtils {
+ enum class ClockError;
+ namespace sockets {
+diff --git a/include/clockUtils/sockets/UdpSocket.h b/include/clockUtils/sockets/UdpSocket.h
+index 31eeeb5..c5da451 100644
+--- a/include/clockUtils/sockets/UdpSocket.h
++++ b/include/clockUtils/sockets/UdpSocket.h
+@@ -60,10 +60,6 @@
+ #define INVALID_SOCKET -1
+ #endif
+
+-namespace std {
+- class thread;
+-} /* namespace std */
+-
+ namespace clockUtils {
+ enum class ClockError;
+ namespace sockets {
diff --git a/ports/clockutils/portfile.cmake b/ports/clockutils/portfile.cmake
index 33f0b1f83..433cc0b0a 100644
--- a/ports/clockutils/portfile.cmake
+++ b/ports/clockutils/portfile.cmake
@@ -14,6 +14,11 @@ else()
SET(SHARED_FLAG OFF)
endif()
+vcpkg_apply_patches(
+ SOURCE_PATH ${SOURCE_PATH}
+ PATCHES "${CURRENT_PORT_DIR}/fix-warningC4643.patch"
+)
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS