From a0327e0b74de19312b878e0e6ff212f24bc94db3 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Wed, 13 Jul 2022 12:35:54 +0200 Subject: [PATCH 1/2] Update license headers Use the more concise format omitting the reference to the license file and refer to the URL only. --- .appveyor.yml | 5 ++-- .azure-pipelines.yml | 2 +- .github/workflows/ci.yml | 3 ++- .github/workflows/ci_tests.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/update_standalone.yml | 2 +- CMakeLists.txt | 2 +- README.md | 10 ++++---- build/Jamfile.v2 | 7 +++--- config/check_attribute_init_priority.cpp | 7 +++--- config/check_lfs_support.cpp | 7 +++--- config/check_movable_fstreams.cpp | 7 +++--- doc/Jamfile.v2 | 4 ++-- doc/LICENSE_1_0.txt | 23 ------------------- doc/changelog.dox | 8 +++---- doc/gendoc.sh | 10 ++++---- doc/main.dox | 10 ++++---- include/boost/nowide/args.hpp | 9 ++++---- include/boost/nowide/config.hpp | 11 ++++----- include/boost/nowide/convert.hpp | 11 ++++----- include/boost/nowide/cstdio.hpp | 11 ++++----- include/boost/nowide/cstdlib.hpp | 9 ++++---- include/boost/nowide/detail/convert.hpp | 9 ++++---- include/boost/nowide/detail/is_path.hpp | 9 ++++---- .../nowide/detail/is_string_container.hpp | 9 ++++---- include/boost/nowide/detail/utf.hpp | 9 ++++---- include/boost/nowide/filebuf.hpp | 11 ++++----- include/boost/nowide/filesystem.hpp | 9 ++++---- include/boost/nowide/fstream.hpp | 9 ++++---- include/boost/nowide/iostream.hpp | 9 ++++---- include/boost/nowide/replacement.hpp | 9 ++++---- include/boost/nowide/stackstring.hpp | 9 ++++---- include/boost/nowide/stat.hpp | 8 +++---- include/boost/nowide/utf/convert.hpp | 11 ++++----- include/boost/nowide/utf/utf.hpp | 11 ++++----- include/boost/nowide/utf8_codecvt.hpp | 11 ++++----- include/boost/nowide/windows.hpp | 11 ++++----- src/console_buffer.cpp | 9 ++++---- src/console_buffer.hpp | 9 ++++---- src/cstdio.cpp | 10 ++++---- src/cstdlib.cpp | 10 ++++---- src/filebuf.cpp | 8 +++---- src/iostream.cpp | 9 ++++---- src/stat.cpp | 7 +++--- standalone/config.hpp | 11 ++++----- test/CMakeLists.txt | 2 +- test/Jamfile.v2 | 5 +--- test/benchmark_fstream.cpp | 10 ++++---- test/cmake_test/CMakeLists.txt | 3 ++- test/cmake_test/main.cpp | 8 +++---- test/file_test_helpers.cpp | 7 +++--- test/file_test_helpers.hpp | 7 +++--- test/test.hpp | 11 ++++----- test/test_codecvt.cpp | 8 +++---- test/test_convert.cpp | 8 +++---- test/test_env.cpp | 8 +++---- test/test_filebuf.cpp | 9 ++++---- test/test_fs.cpp | 10 ++++---- test/test_fstream.cpp | 9 ++++---- test/test_fstream_special.cpp | 9 ++++---- test/test_ifstream.cpp | 9 ++++---- test/test_iostream.cpp | 9 ++++---- test/test_iostream_passthrough.cmake | 2 +- test/test_ofstream.cpp | 9 ++++---- test/test_sets.hpp | 9 ++++---- test/test_stackstring.cpp | 10 ++++---- test/test_stat.cpp | 7 +++--- test/test_stdio.cpp | 10 ++++---- test/test_system.cpp | 9 ++++---- test/test_traits.cpp | 8 +++---- tools/create_standalone.sh | 2 +- 71 files changed, 242 insertions(+), 335 deletions(-) delete mode 100644 doc/LICENSE_1_0.txt diff --git a/.appveyor.yml b/.appveyor.yml index f14b4dd9..08cf18de 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,8 +1,9 @@ # Copyright 2016, 2017 Peter Dimov # Copyright 2017 - 2019 James E. King III # Copyright 2019 - 2022 Alexander Grund +# # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt) +# https://www.boost.org/LICENSE_1_0.txt version: 1.0.{build}-{branch} @@ -27,7 +28,7 @@ environment: global: B2_CI_VERSION: 1 GIT_FETCH_JOBS: 4 - # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties + # see: https://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties # to use the default for a given environment, comment it out; recommend you build debug and release however: # on Windows it is important to exercise all the possibilities, especially shared vs static, however most # libraries that care about this exercise it in their Jamfiles... diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 6796e039..57b9acb7 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -3,7 +3,7 @@ # Copyright 2019 Mateusz Loskot # Copyright 2020-2021 Alexander Grund # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) +# https://www.boost.org/LICENSE_1_0.txt # # Generic Azure Pipelines build script for boostorg repositories diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 110369f6..a78770eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,8 @@ # Copyright 2022 James E. King III # # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) +# https://www.boost.org/LICENSE_1_0.txt + --- name: CI diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index d707372a..0d7151fa 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -1,6 +1,6 @@ # Copyright 2019 - 2022 Alexander Grund # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt) +# https://www.boost.org/LICENSE_1_0.txt name: CI Tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 089a8905..30523234 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,6 @@ # Copyright 2019 - 2020 Alexander Grund # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt) +# https://www.boost.org/LICENSE_1_0.txt on: push: diff --git a/.github/workflows/update_standalone.yml b/.github/workflows/update_standalone.yml index b74a818d..4adb99b1 100644 --- a/.github/workflows/update_standalone.yml +++ b/.github/workflows/update_standalone.yml @@ -1,6 +1,6 @@ # Copyright 2019 - 2021 Alexander Grund # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt) +# https://www.boost.org/LICENSE_1_0.txt on: push: diff --git a/CMakeLists.txt b/CMakeLists.txt index 7aabda39..cc97ce8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # Copyright 2019 - 2020 Alexander Grund # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt) +# https://www.boost.org/LICENSE_1_0.txt # Builds the libraries for Boost.Nowide # diff --git a/README.md b/README.md index 537be663..b2f981f3 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ Branch | Appveyor | Github | codecov.io | Deps | Docs | Tests | ------------|----------|--------|------------| ---- | ---- | ----- | -[master](https://github.com/boostorg/nowide/tree/master) | [![Build status](https://ci.appveyor.com/api/projects/status/w5sywrekwd66say4/branch/master?svg=true)](https://ci.appveyor.com/project/Flamefire/nowide-fr98b/branch/master) | ![](https://github.com/boostorg/nowide/workflows/CI%20Tests/badge.svg?branch=master) ![](https://github.com/boostorg/nowide/workflows/POSIX/badge.svg?branch=master) | [![codecov](https://codecov.io/gh/boostorg/nowide/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/nowide/branch/master) | [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/nowide.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](https://www.boost.org/doc/libs/master/libs/nowide/index.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](http://www.boost.org/development/tests/master/developer/nowide.html) -[develop](https://github.com/boostorg/nowide/tree/develop) | [![Build status](https://ci.appveyor.com/api/projects/status/w5sywrekwd66say4/branch/develop?svg=true)](https://ci.appveyor.com/project/Flamefire/nowide-fr98b/branch/develop) | ![](https://github.com/boostorg/nowide/workflows/CI%20Tests/badge.svg?branch=develop) ![](https://github.com/boostorg/nowide/workflows/POSIX/badge.svg?branch=develop) | [![codecov](https://codecov.io/gh/boostorg/nowide/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/nowide/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/nowide.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](https://www.boost.org/doc/libs/develop/libs/nowide/index.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/nowide.html) +[master](https://github.com/boostorg/nowide/tree/master) | [![Build status](https://ci.appveyor.com/api/projects/status/w5sywrekwd66say4/branch/master?svg=true)](https://ci.appveyor.com/project/Flamefire/nowide-fr98b/branch/master) | ![](https://github.com/boostorg/nowide/workflows/CI%20Tests/badge.svg?branch=master) ![](https://github.com/boostorg/nowide/workflows/POSIX/badge.svg?branch=master) | [![codecov](https://codecov.io/gh/boostorg/nowide/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/nowide/branch/master) | [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/nowide.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](https://www.boost.org/doc/libs/master/libs/nowide/index.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](https://www.boost.org/development/tests/master/developer/nowide.html) +[develop](https://github.com/boostorg/nowide/tree/develop) | [![Build status](https://ci.appveyor.com/api/projects/status/w5sywrekwd66say4/branch/develop?svg=true)](https://ci.appveyor.com/project/Flamefire/nowide-fr98b/branch/develop) | ![](https://github.com/boostorg/nowide/workflows/CI%20Tests/badge.svg?branch=develop) ![](https://github.com/boostorg/nowide/workflows/POSIX/badge.svg?branch=develop) | [![codecov](https://codecov.io/gh/boostorg/nowide/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/nowide/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/nowide.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](https://www.boost.org/doc/libs/develop/libs/nowide/index.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](https://www.boost.org/development/tests/develop/developer/nowide.html) Quality checks: [![Coverity Scan Build Status](https://scan.coverity.com/projects/20464/badge.svg)](https://scan.coverity.com/projects/boostorg-nowide) @@ -15,7 +15,7 @@ The library provides an implementation of standard C and C++ library functions, ### License -Distributed under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt). +Distributed under the [Boost Software License, Version 1.0](https://www.boost.org/LICENSE_1_0.txt). ### Properties @@ -104,5 +104,5 @@ Boost.Nowide integrates with Boost.Filesystem: * [Ask questions](http://stackoverflow.com/questions/ask?tags=c%2B%2B,boost,boost-nowide) * [Report bugs](https://github.com/boostorg/nowide/issues): Be sure to mention Boost version, platform and compiler you're using. A small compilable code sample to reproduce the problem is always good as well. -* Submit your patches as pull requests against **develop** branch. Note that by submitting patches you agree to license your modifications under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt). -* Discussions about the library are held on the [Boost developers mailing list](http://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](http://www.boost.org/community/policy.html) before posting and add the `[nowide]` tag at the beginning of the subject line. +* Submit your patches as pull requests against **develop** branch. Note that by submitting patches you agree to license your modifications under the [Boost Software License, Version 1.0](https://www.boost.org/LICENSE_1_0.txt). +* Discussions about the library are held on the [Boost developers mailing list](https://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](https://www.boost.org/community/policy.html) before posting and add the `[nowide]` tag at the beginning of the subject line. diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 3cf8988b..0eab1694 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -1,12 +1,11 @@ -# Boost Nowide Library Build Jamfile - # Copyright (c) 2002, 2006 Beman Dawes # Copyright (c) 2012 Artyom Beilis (Tonkikh) # Copyright (c) 2020-2021 Alexander Grund # # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE or www.boost.org/LICENSE_1_0.txt) -# See library home page at http://www.boost.org/libs/nowide +# https://www.boost.org/LICENSE_1_0.txt +# +# See library home page at https://www.boost.org/libs/nowide import ../../config/checks/config : requires ; import configure ; diff --git a/config/check_attribute_init_priority.cpp b/config/check_attribute_init_priority.cpp index 7525fe08..fab03e24 100644 --- a/config/check_attribute_init_priority.cpp +++ b/config/check_attribute_init_priority.cpp @@ -1,8 +1,7 @@ -// Copyright (c) 2021 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at http://www.boost.org/LICENSE.txt) +// Copyright (c) 2021 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt class Foo {}; diff --git a/config/check_lfs_support.cpp b/config/check_lfs_support.cpp index 095c614f..791787f7 100644 --- a/config/check_lfs_support.cpp +++ b/config/check_lfs_support.cpp @@ -1,9 +1,8 @@ // -// Copyright (c) 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at http://www.boost.org/LICENSE.txt) +// Copyright (c) 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #define _LARGEFILE_SOURCE #ifndef _FILE_OFFSET_BITS diff --git a/config/check_movable_fstreams.cpp b/config/check_movable_fstreams.cpp index 4970d9d7..ed6be385 100644 --- a/config/check_movable_fstreams.cpp +++ b/config/check_movable_fstreams.cpp @@ -1,9 +1,8 @@ // -// Copyright (c) 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at http://www.boost.org/LICENSE.txt) +// Copyright (c) 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #include #include diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index b6f0ba6b..e03d6af3 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -1,7 +1,7 @@ # Copyright (C) 2019-2019 Alexander Grund +# # Distributed under the Boost Software License, Version 1.0 -# (see accompanying file LICENSE or a copy at -# http://www.boost.org/LICENSE_1_0.txt) +# https://www.boost.org/LICENSE_1_0.txt using doxygen ; import doxygen ; diff --git a/doc/LICENSE_1_0.txt b/doc/LICENSE_1_0.txt deleted file mode 100644 index 36b7cd93..00000000 --- a/doc/LICENSE_1_0.txt +++ /dev/null @@ -1,23 +0,0 @@ -Boost Software License - Version 1.0 - August 17th, 2003 - -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. diff --git a/doc/changelog.dox b/doc/changelog.dox index 4e38e6ec..612daa38 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -1,10 +1,8 @@ // -// Copyright (c) 2019-2021 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2019-2021 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt /*! \page changelog_page Changelog diff --git a/doc/gendoc.sh b/doc/gendoc.sh index e57dbc0e..cdf52a0c 100755 --- a/doc/gendoc.sh +++ b/doc/gendoc.sh @@ -1,11 +1,9 @@ #!/bin/bash + +# Copyright (c) 2009-2011 Artyom Beilis (Tonkikh) # -# Copyright (c) 2009-2011 Artyom Beilis (Tonkikh) -# -# Distributed under the Boost Software License, Version 1.0. (See -# accompanying file LICENSE or copy at -# http://www.boost.org/LICENSE_1_0.txt) -# +# Distributed under the Boost Software License, Version 1.0. +# https://www.boost.org/LICENSE_1_0.txt set -euo pipefail diff --git a/doc/main.dox b/doc/main.dox index 0b11cfca..4ebf5c13 100644 --- a/doc/main.dox +++ b/doc/main.dox @@ -1,11 +1,9 @@ // -// Copyright (c) 2009-2011 Artyom Beilis (Tonkikh) -// Copyright (c) 2019-2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2009-2011 Artyom Beilis (Tonkikh) +// Copyright (c) 2019-2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt /*! diff --git a/include/boost/nowide/args.hpp b/include/boost/nowide/args.hpp index 3c7a47ce..6c382dce 100644 --- a/include/boost/nowide/args.hpp +++ b/include/boost/nowide/args.hpp @@ -1,10 +1,9 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_ARGS_HPP_INCLUDED #define BOOST_NOWIDE_ARGS_HPP_INCLUDED diff --git a/include/boost/nowide/config.hpp b/include/boost/nowide/config.hpp index f18e69b6..1ba7c5f5 100644 --- a/include/boost/nowide/config.hpp +++ b/include/boost/nowide/config.hpp @@ -1,11 +1,10 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2019 - 2022 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2019 - 2022 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_CONFIG_HPP_INCLUDED #define BOOST_NOWIDE_CONFIG_HPP_INCLUDED diff --git a/include/boost/nowide/convert.hpp b/include/boost/nowide/convert.hpp index 5e913d8a..10bc2f1f 100644 --- a/include/boost/nowide/convert.hpp +++ b/include/boost/nowide/convert.hpp @@ -1,11 +1,10 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_CONVERT_HPP_INCLUDED #define BOOST_NOWIDE_CONVERT_HPP_INCLUDED diff --git a/include/boost/nowide/cstdio.hpp b/include/boost/nowide/cstdio.hpp index f3b4b5db..4cdad947 100644 --- a/include/boost/nowide/cstdio.hpp +++ b/include/boost/nowide/cstdio.hpp @@ -1,11 +1,10 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_CSTDIO_HPP_INCLUDED #define BOOST_NOWIDE_CSTDIO_HPP_INCLUDED diff --git a/include/boost/nowide/cstdlib.hpp b/include/boost/nowide/cstdlib.hpp index 1f89e729..a48028a1 100644 --- a/include/boost/nowide/cstdlib.hpp +++ b/include/boost/nowide/cstdlib.hpp @@ -1,10 +1,9 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED #define BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED diff --git a/include/boost/nowide/detail/convert.hpp b/include/boost/nowide/detail/convert.hpp index 5fcf3a1a..39593fa7 100644 --- a/include/boost/nowide/detail/convert.hpp +++ b/include/boost/nowide/detail/convert.hpp @@ -1,10 +1,9 @@ // -// Copyright (c) 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_DETAIL_CONVERT_HPP_INCLUDED #define BOOST_NOWIDE_DETAIL_CONVERT_HPP_INCLUDED diff --git a/include/boost/nowide/detail/is_path.hpp b/include/boost/nowide/detail/is_path.hpp index aee11b43..84413c31 100644 --- a/include/boost/nowide/detail/is_path.hpp +++ b/include/boost/nowide/detail/is_path.hpp @@ -1,10 +1,9 @@ // -// Copyright (c) 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_DETAIL_IS_PATH_HPP_INCLUDED #define BOOST_NOWIDE_DETAIL_IS_PATH_HPP_INCLUDED diff --git a/include/boost/nowide/detail/is_string_container.hpp b/include/boost/nowide/detail/is_string_container.hpp index 1b54a608..ffaa94b4 100644 --- a/include/boost/nowide/detail/is_string_container.hpp +++ b/include/boost/nowide/detail/is_string_container.hpp @@ -1,10 +1,9 @@ // -// Copyright (c) 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_DETAIL_IS_STRING_CONTAINER_HPP_INCLUDED #define BOOST_NOWIDE_DETAIL_IS_STRING_CONTAINER_HPP_INCLUDED diff --git a/include/boost/nowide/detail/utf.hpp b/include/boost/nowide/detail/utf.hpp index 09302817..11b723fa 100644 --- a/include/boost/nowide/detail/utf.hpp +++ b/include/boost/nowide/detail/utf.hpp @@ -1,10 +1,9 @@ // -// Copyright (c) 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_DETAIL_UTF_HPP_INCLUDED #define BOOST_NOWIDE_DETAIL_UTF_HPP_INCLUDED diff --git a/include/boost/nowide/filebuf.hpp b/include/boost/nowide/filebuf.hpp index 8a035f04..5e124243 100644 --- a/include/boost/nowide/filebuf.hpp +++ b/include/boost/nowide/filebuf.hpp @@ -1,11 +1,10 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2019-2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2019-2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_FILEBUF_HPP_INCLUDED #define BOOST_NOWIDE_FILEBUF_HPP_INCLUDED diff --git a/include/boost/nowide/filesystem.hpp b/include/boost/nowide/filesystem.hpp index 1df0c945..4ed205ec 100644 --- a/include/boost/nowide/filesystem.hpp +++ b/include/boost/nowide/filesystem.hpp @@ -1,10 +1,9 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_INTEGRATION_FILESYSTEM_HPP_INCLUDED #define BOOST_NOWIDE_INTEGRATION_FILESYSTEM_HPP_INCLUDED diff --git a/include/boost/nowide/fstream.hpp b/include/boost/nowide/fstream.hpp index 1829ff42..bcb271b3 100644 --- a/include/boost/nowide/fstream.hpp +++ b/include/boost/nowide/fstream.hpp @@ -1,10 +1,9 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_FSTREAM_HPP_INCLUDED #define BOOST_NOWIDE_FSTREAM_HPP_INCLUDED diff --git a/include/boost/nowide/iostream.hpp b/include/boost/nowide/iostream.hpp index 3c09203c..54f14001 100644 --- a/include/boost/nowide/iostream.hpp +++ b/include/boost/nowide/iostream.hpp @@ -1,9 +1,8 @@ -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2020-2021 Alexander Grund +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2020-2021 Alexander Grund // -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #ifndef BOOST_NOWIDE_IOSTREAM_HPP_INCLUDED #define BOOST_NOWIDE_IOSTREAM_HPP_INCLUDED diff --git a/include/boost/nowide/replacement.hpp b/include/boost/nowide/replacement.hpp index 4f116277..e44c26bd 100644 --- a/include/boost/nowide/replacement.hpp +++ b/include/boost/nowide/replacement.hpp @@ -1,10 +1,9 @@ // -// Copyright (c) 2018 Artyom Beilis (Tonkikh) -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2018 Artyom Beilis (Tonkikh) // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_REPLACEMENT_HPP_INCLUDED #define BOOST_NOWIDE_REPLACEMENT_HPP_INCLUDED diff --git a/include/boost/nowide/stackstring.hpp b/include/boost/nowide/stackstring.hpp index 7dd336d0..3261ac57 100644 --- a/include/boost/nowide/stackstring.hpp +++ b/include/boost/nowide/stackstring.hpp @@ -1,10 +1,9 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_STACKSTRING_HPP_INCLUDED #define BOOST_NOWIDE_STACKSTRING_HPP_INCLUDED diff --git a/include/boost/nowide/stat.hpp b/include/boost/nowide/stat.hpp index 351a731b..2c269e61 100644 --- a/include/boost/nowide/stat.hpp +++ b/include/boost/nowide/stat.hpp @@ -1,9 +1,9 @@ // -// Copyright (c) 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_STAT_HPP_INCLUDED #define BOOST_NOWIDE_STAT_HPP_INCLUDED diff --git a/include/boost/nowide/utf/convert.hpp b/include/boost/nowide/utf/convert.hpp index ecd540de..e2746f62 100644 --- a/include/boost/nowide/utf/convert.hpp +++ b/include/boost/nowide/utf/convert.hpp @@ -1,11 +1,10 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_UTF_CONVERT_HPP_INCLUDED #define BOOST_NOWIDE_UTF_CONVERT_HPP_INCLUDED diff --git a/include/boost/nowide/utf/utf.hpp b/include/boost/nowide/utf/utf.hpp index acdc57a5..fdb79acf 100644 --- a/include/boost/nowide/utf/utf.hpp +++ b/include/boost/nowide/utf/utf.hpp @@ -1,11 +1,10 @@ // -// Copyright (c) 2009-2011 Artyom Beilis (Tonkikh) -// Copyright (c) 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2009-2011 Artyom Beilis (Tonkikh) +// Copyright (c) 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_UTF_HPP_INCLUDED #define BOOST_NOWIDE_UTF_HPP_INCLUDED diff --git a/include/boost/nowide/utf8_codecvt.hpp b/include/boost/nowide/utf8_codecvt.hpp index ebe0bccc..c61c138d 100644 --- a/include/boost/nowide/utf8_codecvt.hpp +++ b/include/boost/nowide/utf8_codecvt.hpp @@ -1,11 +1,10 @@ // -// Copyright (c) 2015 Artyom Beilis (Tonkikh) -// Copyright (c) 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2015 Artyom Beilis (Tonkikh) +// Copyright (c) 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_UTF8_CODECVT_HPP_INCLUDED #define BOOST_NOWIDE_UTF8_CODECVT_HPP_INCLUDED diff --git a/include/boost/nowide/windows.hpp b/include/boost/nowide/windows.hpp index e7c37f4f..9d32f22f 100644 --- a/include/boost/nowide/windows.hpp +++ b/include/boost/nowide/windows.hpp @@ -1,11 +1,10 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2022 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2022 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_WINDOWS_HPP_INCLUDED #define BOOST_NOWIDE_WINDOWS_HPP_INCLUDED diff --git a/src/console_buffer.cpp b/src/console_buffer.cpp index f92079be..5b6cbe26 100644 --- a/src/console_buffer.cpp +++ b/src/console_buffer.cpp @@ -1,9 +1,8 @@ -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2020 - 2021 Alexander Grund +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2020 - 2021 Alexander Grund // -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #define BOOST_NOWIDE_SOURCE #include "console_buffer.hpp" diff --git a/src/console_buffer.hpp b/src/console_buffer.hpp index 65d01f2d..0074b384 100644 --- a/src/console_buffer.hpp +++ b/src/console_buffer.hpp @@ -1,9 +1,8 @@ -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2020 - 2021 Alexander Grund +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2020 - 2021 Alexander Grund // -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #ifndef BOOST_NOWIDE_DETAIL_CONSOLE_BUFFER_HPP_INCLUDED #define BOOST_NOWIDE_DETAIL_CONSOLE_BUFFER_HPP_INCLUDED diff --git a/src/cstdio.cpp b/src/cstdio.cpp index d28ae52c..0aa46ed7 100644 --- a/src/cstdio.cpp +++ b/src/cstdio.cpp @@ -1,11 +1,9 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2020-2022 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2020-2022 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #define BOOST_NOWIDE_SOURCE diff --git a/src/cstdlib.cpp b/src/cstdlib.cpp index 5a484374..4234a715 100644 --- a/src/cstdlib.cpp +++ b/src/cstdlib.cpp @@ -1,11 +1,9 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2020-2022 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2020-2022 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #define BOOST_NOWIDE_SOURCE diff --git a/src/filebuf.cpp b/src/filebuf.cpp index 50388db1..aea4e784 100644 --- a/src/filebuf.cpp +++ b/src/filebuf.cpp @@ -1,10 +1,8 @@ // -// Copyright (c) 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #define BOOST_NOWIDE_SOURCE diff --git a/src/iostream.cpp b/src/iostream.cpp index be256c15..26959926 100644 --- a/src/iostream.cpp +++ b/src/iostream.cpp @@ -1,9 +1,8 @@ -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2020-2021 Alexander Grund +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2020-2021 Alexander Grund // -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #define BOOST_NOWIDE_SOURCE #include diff --git a/src/stat.cpp b/src/stat.cpp index aac6f251..117ede35 100644 --- a/src/stat.cpp +++ b/src/stat.cpp @@ -1,9 +1,8 @@ // -// Copyright (c) 2020-2022 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2020-2022 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #define BOOST_NOWIDE_SOURCE diff --git a/standalone/config.hpp b/standalone/config.hpp index bf3afac3..cbb4cfb2 100644 --- a/standalone/config.hpp +++ b/standalone/config.hpp @@ -1,11 +1,10 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2020 - 2022 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2020 - 2022 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + // Defines macros which otherwise get defined by including #if(defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && !defined(__CYGWIN__) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 6f91fc2b..5dab7577 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,6 +1,6 @@ # Copyright 2019 - 2021 Alexander Grund # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt) +# https://www.boost.org/LICENSE_1_0.txt include(CheckCXXCompilerFlag) check_cxx_compiler_flag(-Wsuggest-override _BOOST_NOWIDE_SUGGEST_OVERRIDE_SUPPORTED) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 0db56fea..9cdaac86 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -1,12 +1,9 @@ -# Boost Nowide Library test Jamfile - # Copyright (c) 2003, 2006 Beman Dawes # Copyright (c) 2012 Artyom Beilis (Tonkikh) # Copyright (c) 2020-2022 Alexander Grund # # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE or www.boost.org/LICENSE_1_0.txt) -# See library home page at http://www.boost.org/libs/nowide +# https://www.boost.org/LICENSE_1_0.txt import testing ; import config : requires ; diff --git a/test/benchmark_fstream.cpp b/test/benchmark_fstream.cpp index e5c8a382..e464d0cf 100644 --- a/test/benchmark_fstream.cpp +++ b/test/benchmark_fstream.cpp @@ -1,11 +1,9 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2019 - 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2019 - 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #define BOOST_NOWIDE_TEST_NO_MAIN diff --git a/test/cmake_test/CMakeLists.txt b/test/cmake_test/CMakeLists.txt index 11d5d98c..942a73ff 100644 --- a/test/cmake_test/CMakeLists.txt +++ b/test/cmake_test/CMakeLists.txt @@ -1,6 +1,7 @@ # Copyright 2021 Alexander Grund +# # 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 +# https://www.boost.org/LICENSE_1_0.txt cmake_minimum_required(VERSION 3.5...3.16) diff --git a/test/cmake_test/main.cpp b/test/cmake_test/main.cpp index 36ccb89e..097bf1a2 100644 --- a/test/cmake_test/main.cpp +++ b/test/cmake_test/main.cpp @@ -1,10 +1,8 @@ // -// Copyright (c) 2019-2021 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2019-2021 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #include #include diff --git a/test/file_test_helpers.cpp b/test/file_test_helpers.cpp index 36de84a3..65e3d7ee 100644 --- a/test/file_test_helpers.cpp +++ b/test/file_test_helpers.cpp @@ -1,8 +1,7 @@ -// Copyright (c) 2019-2021 Alexander Grund +// Copyright (c) 2019-2021 Alexander Grund // -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #define BOOST_NOWIDE_TEST_NO_MAIN #include "file_test_helpers.hpp" diff --git a/test/file_test_helpers.hpp b/test/file_test_helpers.hpp index 0902ee09..e2483216 100644 --- a/test/file_test_helpers.hpp +++ b/test/file_test_helpers.hpp @@ -1,8 +1,7 @@ -// Copyright (c) 2019-2021 Alexander Grund +// Copyright (c) 2019-2021 Alexander Grund // -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #ifndef BOOST_NOWIDE_FILE_TEST_HELPERS_HPP_INCLUDED #define BOOST_NOWIDE_FILE_TEST_HELPERS_HPP_INCLUDED diff --git a/test/test.hpp b/test/test.hpp index 9bc88524..f5a8ec62 100644 --- a/test/test.hpp +++ b/test/test.hpp @@ -1,11 +1,10 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2019-2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2019-2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_LIB_TEST_H_INCLUDED #define BOOST_NOWIDE_LIB_TEST_H_INCLUDED diff --git a/test/test_codecvt.cpp b/test/test_codecvt.cpp index 0be3f255..a18ce00f 100644 --- a/test/test_codecvt.cpp +++ b/test/test_codecvt.cpp @@ -1,10 +1,8 @@ // -// Copyright (c) 2015 Artyom Beilis (Tonkikh) -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2015 Artyom Beilis (Tonkikh) // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #include diff --git a/test/test_convert.cpp b/test/test_convert.cpp index 84185c5d..8f13e0aa 100644 --- a/test/test_convert.cpp +++ b/test/test_convert.cpp @@ -1,10 +1,8 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #include #include "test.hpp" diff --git a/test/test_env.cpp b/test/test_env.cpp index 38ded69a..0bc782be 100644 --- a/test/test_env.cpp +++ b/test/test_env.cpp @@ -1,10 +1,8 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #include #include "test.hpp" diff --git a/test/test_filebuf.cpp b/test/test_filebuf.cpp index ba02961f..a56c87db 100644 --- a/test/test_filebuf.cpp +++ b/test/test_filebuf.cpp @@ -1,9 +1,8 @@ -// Copyright (c) 2015 Artyom Beilis (Tonkikh) -// Copyright (c) 2019-2021 Alexander Grund +// Copyright (c) 2015 Artyom Beilis (Tonkikh) +// Copyright (c) 2019-2021 Alexander Grund // -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #include diff --git a/test/test_fs.cpp b/test/test_fs.cpp index 394ac4c6..28767c4a 100644 --- a/test/test_fs.cpp +++ b/test/test_fs.cpp @@ -1,11 +1,9 @@ // -// Copyright (c) 2015 Artyom Beilis (Tonkikh) -// Copyright (c) 2021 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2015 Artyom Beilis (Tonkikh) +// Copyright (c) 2021 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #if defined(__GNUC__) && __GNUC__ >= 7 #pragma GCC diagnostic ignored "-Wattributes" diff --git a/test/test_fstream.cpp b/test/test_fstream.cpp index 7119505c..0c7257d0 100644 --- a/test/test_fstream.cpp +++ b/test/test_fstream.cpp @@ -1,9 +1,8 @@ -// Copyright (c) 2015 Artyom Beilis (Tonkikh) -// Copyright (c) 2019-2021 Alexander Grund +// Copyright (c) 2015 Artyom Beilis (Tonkikh) +// Copyright (c) 2019-2021 Alexander Grund // -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #include diff --git a/test/test_fstream_special.cpp b/test/test_fstream_special.cpp index 108cd271..b2838dd5 100644 --- a/test/test_fstream_special.cpp +++ b/test/test_fstream_special.cpp @@ -1,9 +1,8 @@ -// Copyright (c) 2015 Artyom Beilis (Tonkikh) -// Copyright (c) 2019-2021 Alexander Grund +// Copyright (c) 2015 Artyom Beilis (Tonkikh) +// Copyright (c) 2019-2021 Alexander Grund // -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #include diff --git a/test/test_ifstream.cpp b/test/test_ifstream.cpp index 3151257e..5d612c14 100644 --- a/test/test_ifstream.cpp +++ b/test/test_ifstream.cpp @@ -1,9 +1,8 @@ -// Copyright (c) 2015 Artyom Beilis (Tonkikh) -// Copyright (c) 2019-2021 Alexander Grund +// Copyright (c) 2015 Artyom Beilis (Tonkikh) +// Copyright (c) 2019-2021 Alexander Grund // -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #include diff --git a/test/test_iostream.cpp b/test/test_iostream.cpp index 3a9613c3..8dfcdf76 100644 --- a/test/test_iostream.cpp +++ b/test/test_iostream.cpp @@ -1,9 +1,8 @@ -// Copyright (c) 2015 Artyom Beilis (Tonkikh) -// Copyright (c) 2020 - 2021 Alexander Grund +// Copyright (c) 2015 Artyom Beilis (Tonkikh) +// Copyright (c) 2020 - 2021 Alexander Grund // -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #ifndef _SCL_SECURE_NO_WARNINGS // Call to 'std::copy_n' with parameters that may be unsafe diff --git a/test/test_iostream_passthrough.cmake b/test/test_iostream_passthrough.cmake index 8dfc2ad0..61396bfb 100644 --- a/test/test_iostream_passthrough.cmake +++ b/test/test_iostream_passthrough.cmake @@ -1,6 +1,6 @@ # Copyright 2019 - 2021 Alexander Grund # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt) +# https://www.boost.org/LICENSE_1_0.txt if(NOT DEFINED TEST_BINARY) if(CMAKE_ARGC GREATER 3) diff --git a/test/test_ofstream.cpp b/test/test_ofstream.cpp index a39a914f..a2110960 100644 --- a/test/test_ofstream.cpp +++ b/test/test_ofstream.cpp @@ -1,9 +1,8 @@ -// Copyright (c) 2015 Artyom Beilis (Tonkikh) -// Copyright (c) 2019-2021 Alexander Grund +// Copyright (c) 2015 Artyom Beilis (Tonkikh) +// Copyright (c) 2019-2021 Alexander Grund // -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #include diff --git a/test/test_sets.hpp b/test/test_sets.hpp index d4e0c8a3..bd46ee42 100644 --- a/test/test_sets.hpp +++ b/test/test_sets.hpp @@ -1,10 +1,9 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifndef BOOST_NOWIDE_TEST_SETS_HPP_INCLUDED #define BOOST_NOWIDE_TEST_SETS_HPP_INCLUDED diff --git a/test/test_stackstring.cpp b/test/test_stackstring.cpp index 8452ba4a..57b67249 100644 --- a/test/test_stackstring.cpp +++ b/test/test_stackstring.cpp @@ -1,11 +1,9 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2019-2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2019-2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #include #include "test.hpp" diff --git a/test/test_stat.cpp b/test/test_stat.cpp index 3cedc2cf..13c1082a 100644 --- a/test/test_stat.cpp +++ b/test/test_stat.cpp @@ -1,9 +1,8 @@ // -// Copyright (c) 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #include diff --git a/test/test_stdio.cpp b/test/test_stdio.cpp index 409d3c40..2d40b3c6 100644 --- a/test/test_stdio.cpp +++ b/test/test_stdio.cpp @@ -1,11 +1,9 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// Copyright (c) 2019 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) +// Copyright (c) 2019 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #include diff --git a/test/test_system.cpp b/test/test_system.cpp index 50e1937b..2c0e37e7 100644 --- a/test/test_system.cpp +++ b/test/test_system.cpp @@ -1,10 +1,9 @@ // -// Copyright (c) 2012 Artyom Beilis (Tonkikh) -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2012 Artyom Beilis (Tonkikh) // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + #ifdef _MSC_VER #define _CRT_SECURE_NO_WARNINGS #endif diff --git a/test/test_traits.cpp b/test/test_traits.cpp index 8ff71de7..18496224 100644 --- a/test/test_traits.cpp +++ b/test/test_traits.cpp @@ -1,10 +1,8 @@ // -// Copyright (c) 2020 Alexander Grund -// -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Copyright (c) 2020 Alexander Grund // +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt #include #include diff --git a/tools/create_standalone.sh b/tools/create_standalone.sh index 568df563..09cdd14a 100644 --- a/tools/create_standalone.sh +++ b/tools/create_standalone.sh @@ -2,7 +2,7 @@ # Copyright 2019 - 2020 Alexander Grund # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt) +# https://www.boost.org/LICENSE_1_0.txt set -euo pipefail From fed43a678bf29e1e1e3a342e724961d198a3ac37 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Wed, 13 Jul 2022 12:43:22 +0200 Subject: [PATCH 2/2] Remove uneccessary cast in test_swap The cast is actually wrong as the return value of `get` is `int` already. --- test/test_fstream_special.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/test_fstream_special.cpp b/test/test_fstream_special.cpp index b2838dd5..37a5e9f4 100644 --- a/test/test_fstream_special.cpp +++ b/test/test_fstream_special.cpp @@ -222,6 +222,7 @@ void test_swap(const char* filename, const char* filename2) { const int curChar1 = f1.peek(); const int curChar2 = f2.peek(); + TEST_CONTEXT("ctr " << ctr << ": c1=" << curChar1 << " c2=" << curChar2); // Randomly do a no-op seek of either or both streams to flush internal buffer if(ctr % 10 == 0) TEST(f1.seekg(f1.tellg())); @@ -234,9 +235,9 @@ void test_swap(const char* filename, const char* filename2) TEST(f1.seekg(f1.tellg())); else if(ctr % 15 == 4) TEST(f2.seekg(f2.tellg())); - TEST_EQ(f1.get(), char(curChar2)); + TEST_EQ(f1.get(), curChar2); f1.swap(f2); - TEST_EQ(f1.get(), char(curChar1)); + TEST_EQ(f1.get(), curChar1); ++ctr; } }