diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-06-06 00:30:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-06 00:30:45 -0700 |
| commit | 6f6101065fc19d6ffea09b24ff174cdfbf9e75dd (patch) | |
| tree | 00c9c91ff26e28fa4c36c1f3d460caed4d5d295d | |
| parent | d59359ba62f90f657d9572c9667ee5b0b36634a7 (diff) | |
| parent | 0a3f7be8b237efde93343b248e3b23ed9d5b13cd (diff) | |
| download | vcpkg-6f6101065fc19d6ffea09b24ff174cdfbf9e75dd.tar.gz vcpkg-6f6101065fc19d6ffea09b24ff174cdfbf9e75dd.zip | |
Merge pull request #3628 from LarryIII/Fixclockutils
Fix warning C4643 in clockutils
| -rw-r--r-- | ports/clockutils/CONTROL | 2 | ||||
| -rw-r--r-- | ports/clockutils/fix-warningC4643.patch | 29 | ||||
| -rw-r--r-- | ports/clockutils/portfile.cmake | 14 |
3 files changed, 38 insertions, 7 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..28a1de440 100644 --- a/ports/clockutils/portfile.cmake +++ b/ports/clockutils/portfile.cmake @@ -1,12 +1,14 @@ include(vcpkg_common_functions) -set(VERSION 3651f232c27074c4ceead169e223edf5f00247c5) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/clockUtils-${VERSION}) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/ClockworkOrigins/clockUtils/archive/${VERSION}.tar.gz" - FILENAME "clockUtils-${VERSION}.tar.gz" + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ClockworkOrigins/clockUtils + REF 3651f232c27074c4ceead169e223edf5f00247c5 SHA512 ddb70cae9ced25de77a2df1854dac15e58a77347042ba3ee9c691f85f49edbc6539c84929a7477d429fb9161ba24c57d24d767793b8b1180216d5ddfc5d3ed6a + HEAD_REF dev-1.2 + PATCHES + "${CURRENT_PORT_DIR}/fix-warningC4643.patch" ) -vcpkg_extract_source_archive(${ARCHIVE}) if (VCPKG_CRT_LINKAGE STREQUAL dynamic) SET(SHARED_FLAG ON) |