From e276f63390a225df3af442889258078f9be27cdb Mon Sep 17 00:00:00 2001 From: Glen Fernandes Date: Mon, 16 Dec 2019 20:55:53 -0500 Subject: [PATCH 1/5] Mark detail header as deprecated --- include/boost/io/detail/quoted_manip.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/boost/io/detail/quoted_manip.hpp b/include/boost/io/detail/quoted_manip.hpp index 55a1d48..ce3d578 100644 --- a/include/boost/io/detail/quoted_manip.hpp +++ b/include/boost/io/detail/quoted_manip.hpp @@ -10,9 +10,10 @@ Distributed under the Boost Software License, Version 1.0. #ifndef BOOST_IO_DETAIL_QUOTED_MANIP_HPP #define BOOST_IO_DETAIL_QUOTED_MANIP_HPP -/* -The new implemenation is public in -*/ +#include + +BOOST_HEADER_DEPRECATED(""); + #include #endif From 661bb71ff376c3dd180fb6b174939dacd15458ae Mon Sep 17 00:00:00 2001 From: Glen Fernandes Date: Tue, 17 Dec 2019 08:04:30 -0500 Subject: [PATCH 2/5] Update Travis and Appveyor configurations --- .appveyor.yml | 12 +++++++----- .travis.yml | 11 +++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index eee4d10..220fc08 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -39,18 +39,20 @@ install: - cd .. - git clone -b %BOOST_BRANCH% https://github.com/boostorg/boost.git boost - cd boost - - git submodule update --init tools/build - - git submodule update --init libs/config - - git submodule update --init tools/boostdep + - git submodule init libs/assert + - git submodule init libs/config + - git submodule init libs/core + - git submodule init libs/headers + - git submodule init tools/build + - git submodule init tools/boost_install + - git submodule update - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\io\ - - python tools/boostdep/depinst/depinst.py io - cmd /c bootstrap - b2 headers build: off test_script: - - PATH=%ADDPATH%%PATH% - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD% - if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD% - b2 libs/io/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% diff --git a/.travis.yml b/.travis.yml index 82da550..2ef4ce5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -279,12 +279,15 @@ install: - cd .. - git clone -b $BOOST_BRANCH https://github.com/boostorg/boost.git boost - cd boost - - git submodule update --init tools/build - - git submodule update --init libs/config - - git submodule update --init tools/boostdep + - git submodule init libs/assert + - git submodule init libs/config + - git submodule init libs/core + - git submodule init libs/headers + - git submodule init tools/build + - git submodule init tools/boost_install + - git submodule update - mkdir -p libs/io - cp -r $TRAVIS_BUILD_DIR/* libs/io - - python tools/boostdep/depinst/depinst.py io - ./bootstrap.sh - ./b2 headers From fc28ee1c44d498767198ab95d3557382f5b4f95f Mon Sep 17 00:00:00 2001 From: Glen Fernandes Date: Tue, 17 Dec 2019 09:24:33 -0500 Subject: [PATCH 3/5] Remove CMake test --- .gitattributes | 96 ---------------------------------- test/test_cmake/CMakeLists.txt | 17 ------ test/test_cmake/main.cpp | 5 -- 3 files changed, 118 deletions(-) delete mode 100644 .gitattributes delete mode 100644 test/test_cmake/CMakeLists.txt delete mode 100644 test/test_cmake/main.cpp diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 3e84d7c..0000000 --- a/.gitattributes +++ /dev/null @@ -1,96 +0,0 @@ -* text=auto !eol svneol=native#text/plain -*.gitattributes text svneol=native#text/plain - -# Scriptish formats -*.bat text svneol=native#text/plain -*.bsh text svneol=native#text/x-beanshell -*.cgi text svneol=native#text/plain -*.cmd text svneol=native#text/plain -*.js text svneol=native#text/javascript -*.php text svneol=native#text/x-php -*.pl text svneol=native#text/x-perl -*.pm text svneol=native#text/x-perl -*.py text svneol=native#text/x-python -*.sh eol=lf svneol=LF#text/x-sh -configure eol=lf svneol=LF#text/x-sh - -# Image formats -*.bmp binary svneol=unset#image/bmp -*.gif binary svneol=unset#image/gif -*.ico binary svneol=unset#image/ico -*.jpeg binary svneol=unset#image/jpeg -*.jpg binary svneol=unset#image/jpeg -*.png binary svneol=unset#image/png -*.tif binary svneol=unset#image/tiff -*.tiff binary svneol=unset#image/tiff -*.svg text svneol=native#image/svg%2Bxml - -# Data formats -*.pdf binary svneol=unset#application/pdf -*.avi binary svneol=unset#video/avi -*.doc binary svneol=unset#application/msword -*.dsp text svneol=crlf#text/plain -*.dsw text svneol=crlf#text/plain -*.eps binary svneol=unset#application/postscript -*.gz binary svneol=unset#application/gzip -*.mov binary svneol=unset#video/quicktime -*.mp3 binary svneol=unset#audio/mpeg -*.ppt binary svneol=unset#application/vnd.ms-powerpoint -*.ps binary svneol=unset#application/postscript -*.psd binary svneol=unset#application/photoshop -*.rdf binary svneol=unset#text/rdf -*.rss text svneol=unset#text/xml -*.rtf binary svneol=unset#text/rtf -*.sln text svneol=native#text/plain -*.swf binary svneol=unset#application/x-shockwave-flash -*.tgz binary svneol=unset#application/gzip -*.vcproj text svneol=native#text/xml -*.vcxproj text svneol=native#text/xml -*.vsprops text svneol=native#text/xml -*.wav binary svneol=unset#audio/wav -*.xls binary svneol=unset#application/vnd.ms-excel -*.zip binary svneol=unset#application/zip - -# Text formats -.htaccess text svneol=native#text/plain -*.bbk text svneol=native#text/xml -*.cmake text svneol=native#text/plain -*.css text svneol=native#text/css -*.dtd text svneol=native#text/xml -*.htm text svneol=native#text/html -*.html text svneol=native#text/html -*.ini text svneol=native#text/plain -*.log text svneol=native#text/plain -*.mak text svneol=native#text/plain -*.qbk text svneol=native#text/plain -*.rst text svneol=native#text/plain -*.sql text svneol=native#text/x-sql -*.txt text svneol=native#text/plain -*.xhtml text svneol=native#text/xhtml%2Bxml -*.xml text svneol=native#text/xml -*.xsd text svneol=native#text/xml -*.xsl text svneol=native#text/xml -*.xslt text svneol=native#text/xml -*.xul text svneol=native#text/xul -*.yml text svneol=native#text/plain -boost-no-inspect text svneol=native#text/plain -CHANGES text svneol=native#text/plain -COPYING text svneol=native#text/plain -INSTALL text svneol=native#text/plain -Jamfile text svneol=native#text/plain -Jamroot text svneol=native#text/plain -Jamfile.v2 text svneol=native#text/plain -Jamrules text svneol=native#text/plain -Makefile* text svneol=native#text/plain -README text svneol=native#text/plain -TODO text svneol=native#text/plain - -# Code formats -*.c text svneol=native#text/plain -*.cpp text svneol=native#text/plain -*.h text svneol=native#text/plain -*.hpp text svneol=native#text/plain -*.ipp text svneol=native#text/plain -*.tpp text svneol=native#text/plain -*.jam text svneol=native#text/plain -*.java text svneol=native#text/plain diff --git a/test/test_cmake/CMakeLists.txt b/test/test_cmake/CMakeLists.txt deleted file mode 100644 index 46bfcf4..0000000 --- a/test/test_cmake/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2018 Mike Dev -# Distributed under the Boost Software License, Version 1.0. -# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt -# -# NOTE: This does NOT run the unit tests for Boost.IO. -# It only tests, if the CMakeLists.txt file in the -# Boost.IO root directory works as expected. - -cmake_minimum_required( VERSION 3.5 ) - -project( BoostIoCMakeSelfTest ) - -add_subdirectory( ../../../config ${CMAKE_CURRENT_BINARY_DIR}/libs/config ) -add_subdirectory( ../.. ${CMAKE_CURRENT_BINARY_DIR}/libs/io ) - -add_executable( boost_io_cmake_self_test main.cpp ) -target_link_libraries( boost_io_cmake_self_test Boost::io ) diff --git a/test/test_cmake/main.cpp b/test/test_cmake/main.cpp deleted file mode 100644 index e5c3372..0000000 --- a/test/test_cmake/main.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include -#include - -int main() { -} From daf69d8864d7ca539902ed7e13c99a43e43a3e16 Mon Sep 17 00:00:00 2001 From: Glen Fernandes Date: Tue, 17 Dec 2019 09:26:01 -0500 Subject: [PATCH 4/5] Rename Jamfile.v2 to Jamfile --- test/{Jamfile.v2 => Jamfile} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/{Jamfile.v2 => Jamfile} (100%) diff --git a/test/Jamfile.v2 b/test/Jamfile similarity index 100% rename from test/Jamfile.v2 rename to test/Jamfile From 00b2270c66b4a2b184a63927064c0e3c56195a08 Mon Sep 17 00:00:00 2001 From: Glen Fernandes Date: Tue, 17 Dec 2019 12:31:06 -0500 Subject: [PATCH 5/5] Remove trailing semicolon after BOOST_HEADER_DEPRECATED --- include/boost/io/detail/quoted_manip.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/io/detail/quoted_manip.hpp b/include/boost/io/detail/quoted_manip.hpp index ce3d578..5b3c4fd 100644 --- a/include/boost/io/detail/quoted_manip.hpp +++ b/include/boost/io/detail/quoted_manip.hpp @@ -12,7 +12,7 @@ Distributed under the Boost Software License, Version 1.0. #include -BOOST_HEADER_DEPRECATED(""); +BOOST_HEADER_DEPRECATED("") #include