diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-05-30 23:41:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 23:41:55 -0700 |
| commit | 33ba0669661bfededfb14bdc0399f638076e5b59 (patch) | |
| tree | 302a82f803bdb2aa3996d686ab812b52f07a5c58 | |
| parent | fa94febc7cc9c68f2743ba87acfbea2e86785d69 (diff) | |
| parent | 9baf6cb2e2372af212c7d16dfbdd614f7f73f12c (diff) | |
| download | vcpkg-33ba0669661bfededfb14bdc0399f638076e5b59.tar.gz vcpkg-33ba0669661bfededfb14bdc0399f638076e5b59.zip | |
Merge pull request #3615 from Cheney-W/FixBoost-iostreams
Remove call to nonexistent member seekpos() of std::fpos
| -rw-r--r-- | ports/boost-iostreams/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-iostreams/Removeseekpos.patch | 13 | ||||
| -rw-r--r-- | ports/boost-iostreams/portfile.cmake | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/boost-iostreams/CONTROL b/ports/boost-iostreams/CONTROL index 249031a5a..462834bab 100644 --- a/ports/boost-iostreams/CONTROL +++ b/ports/boost-iostreams/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-iostreams
-Version: 1.67.0
+Version: 1.67.0-1
Build-Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, zlib, liblzma
Description: Boost iostreams module
diff --git a/ports/boost-iostreams/Removeseekpos.patch b/ports/boost-iostreams/Removeseekpos.patch new file mode 100644 index 000000000..c2a5d4770 --- /dev/null +++ b/ports/boost-iostreams/Removeseekpos.patch @@ -0,0 +1,13 @@ +diff --git a/include/boost/iostreams/positioning.hpp b/include/boost/iostreams/positioning.hpp
+index 12f2afc..709da7d 100644
+--- a/include/boost/iostreams/positioning.hpp
++++ b/include/boost/iostreams/positioning.hpp
+@@ -93,7 +93,7 @@ inline stream_offset fpos_t_to_offset(std::fpos_t pos)
+ inline std::fpos_t streampos_to_fpos_t(std::streampos pos)
+ {
+ # if defined (_CPPLIB_VER) || defined(__IBMCPP__)
+- return pos.seekpos();
++ return pos;
+ # else
+ return pos.get_fpos_t();
+ # endif
diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index c929f9ed7..a6c4e7657 100644 --- a/ports/boost-iostreams/portfile.cmake +++ b/ports/boost-iostreams/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( REF boost-1.67.0
SHA512 73fada0b6e236e0b86f28d8cf75e71dfb6b6a84622986cd72f39de3a310442e6122c91d22ba95bd29381dd559f5cac52a1e28cf97e7e8a6f0c70ccc4f38ceeba
HEAD_REF master
+ PATCHES "${CURRENT_PORT_DIR}/Removeseekpos.patch"
)
vcpkg_download_distfile(LICENSE
|