From b7ddf29ed3b0fd4fb4eb8e797177ae4b1d3cc64c Mon Sep 17 00:00:00 2001 From: Andrey Alekseenko Date: Wed, 4 Aug 2021 12:53:39 +0300 Subject: [PATCH] Remove leftover licenses for optional and string_view After 175d3bb6 (MR !98), we don't bundle std::optional and std::string_view, so no need to mention licenses of their reference implementations. --- COPYING | 66 ++------------------------------------------------------- 1 file changed, 2 insertions(+), 64 deletions(-) diff --git a/COPYING b/COPYING index f229f4bf71..9d8e090edc 100644 --- a/COPYING +++ b/COPYING @@ -513,9 +513,7 @@ respective licenses: 15. Guidelines Support Library (GSL) 16. P0009 reference implementation (Sandia Corporation) 17. pybind11 -18. Reference implementation of std::string_view -19. Reference implementation of std::optional -20. stl_interfaces +18. stl_interfaces ============================================ @@ -1033,67 +1031,7 @@ Please also refer to the file CONTRIBUTING.md, which clarifies licensing of external contributions to this project including patches, pull requests, etc. -- -18. Reference implementation of std::string_view -================================================ - -Used with minor modifications from commit bf5824916b6895ccab0dbc2431520ee3b6d4f27f of -https://github.com/martinmoene/string-view-lite.git, which is licensed as below. - -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. - -19. Reference implementation of std::optional -============================================= - -Used with minor modifications from commit 096ce6d7e45ef184d of -https://github.com/martinmoene/optional-lite.git, which is licensed as below. - -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. - -20. stl_interfaces +18. stl_interfaces ================== Used with minor modification from commit 486db0a5543cea2901ed of -- 2.22.0