From 03f75a98c48eb9e88d04e0995c69eb1baf5e9f2f Mon Sep 17 00:00:00 2001 From: Martin Moene Date: Mon, 4 Jun 2018 21:52:17 +0200 Subject: [PATCH] Re-license under Boost Software License (BSL) --- CMakeLists.txt | 3 ++- LICENSE | 21 --------------------- LICENSE.txt | 23 +++++++++++++++++++++++ README.md | 4 ++-- include/nonstd/optional.hpp | 15 ++++----------- project/CodeBlocks/optional-lite.cbp | 2 +- test/CMakeLists.txt | 3 ++- test/optional-main.t.cpp | 3 ++- test/optional-main.t.h | 3 ++- test/optional.t.cpp | 2 +- 10 files changed, 39 insertions(+), 40 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index d6d954f..52b2074 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,8 @@ # # https://github.com/martinmoene/optional-lite # -# This code is licensed under the MIT License (MIT). +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt) cmake_minimum_required( VERSION 2.8.12 ) diff --git a/LICENSE b/LICENSE deleted file mode 100644 index a0b19ce..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2016 Martin Moene - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -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 AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF 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/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..36b7cd9 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,23 @@ +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/README.md b/README.md index 3f59c2b..ea93659 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ optional lite - A single-file header-only version of a C++17-like optional, a nullable object for C++98, C++11 and later ==================================================== -[![Language](https://img.shields.io/badge/language-C++-blue.svg)](https://isocpp.org/) [![Standard](https://img.shields.io/badge/c%2B%2B-98/11-blue.svg)](https://en.wikipedia.org/wiki/C%2B%2B#Standardization) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT) [![Build Status](https://travis-ci.org/martinmoene/optional-lite.svg?branch=master)](https://travis-ci.org/martinmoene/optional-lite) [![Build status](https://ci.appveyor.com/api/projects/status/1oq5gjm7bufrv6ib?svg=true)](https://ci.appveyor.com/project/martinmoene/optional-lite) [![Version](https://badge.fury.io/gh/martinmoene%2Foptional-lite.svg)](https://github.com/martinmoene/optional-lite/releases) [![download](https://img.shields.io/badge/latest-download-blue.svg)](https://raw.githubusercontent.com/martinmoene/optional-lite/master/include/nonstd/optional.hpp) [![Conan](https://img.shields.io/badge/conan-download-blue.svg)](https://bintray.com/agauniyal/nonstd-lite/optional-lite%3Anonstd-lite/_latestVersion) [![Try it online](https://img.shields.io/badge/try%20it-online-blue.svg)](https://wandbox.org/permlink/DMZg1wOekSwEb54i) +[![Language](https://img.shields.io/badge/language-C++-blue.svg)](https://isocpp.org/) [![Standard](https://img.shields.io/badge/c%2B%2B-98/11-blue.svg)](https://en.wikipedia.org/wiki/C%2B%2B#Standardization) [![License](https://img.shields.io/badge/license-BSL-blue.svg)](https://opensource.org/licenses/BSL-1.0) [![Build Status](https://travis-ci.org/martinmoene/optional-lite.svg?branch=master)](https://travis-ci.org/martinmoene/optional-lite) [![Build status](https://ci.appveyor.com/api/projects/status/1oq5gjm7bufrv6ib?svg=true)](https://ci.appveyor.com/project/martinmoene/optional-lite) [![Version](https://badge.fury.io/gh/martinmoene%2Foptional-lite.svg)](https://github.com/martinmoene/optional-lite/releases) [![download](https://img.shields.io/badge/latest-download-blue.svg)](https://raw.githubusercontent.com/martinmoene/optional-lite/master/include/nonstd/optional.hpp) [![Conan](https://img.shields.io/badge/conan-download-blue.svg)](https://bintray.com/agauniyal/nonstd-lite/optional-lite%3Anonstd-lite/_latestVersion) [![Try it online](https://img.shields.io/badge/try%20it-online-blue.svg)](https://wandbox.org/permlink/VDDmoof3jokMLsBd) **Contents** - [Example usage](#example-usage) @@ -67,7 +67,7 @@ For more examples, see [this answer on StackOverflow](http://stackoverflow.com/a License ------- -*optional lite* uses the [MIT](LICENSE) license. +*optional lite* is distributed under the [Boost Software License](LICENSE.txt). Dependencies diff --git a/include/nonstd/optional.hpp b/include/nonstd/optional.hpp index 8a4a31a..3b773d8 100644 --- a/include/nonstd/optional.hpp +++ b/include/nonstd/optional.hpp @@ -1,24 +1,17 @@ // -// Copyright (c) 2014-2017 Martin Moene +// Copyright (c) 2014-2018 Martin Moene // // https://github.com/martinmoene/optional-lite // -// This code is licensed under the MIT License (MIT). -// -// 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 AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. +// Distributed under the Boost Software License, Version 1.0. +// (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #pragma once #ifndef NONSTD_OPTIONAL_LITE_HPP #define NONSTD_OPTIONAL_LITE_HPP -#define optional_lite_VERSION "2.3.2" +#define optional_lite_VERSION "3.0.0" // Compiler detection (C++20 is speculative): // Note: MSVC supports C++14 since it supports C++17. diff --git a/project/CodeBlocks/optional-lite.cbp b/project/CodeBlocks/optional-lite.cbp index af2ed45..039354b 100644 --- a/project/CodeBlocks/optional-lite.cbp +++ b/project/CodeBlocks/optional-lite.cbp @@ -16,7 +16,7 @@ - + diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index fc64cb6..85d6ce1 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -2,7 +2,8 @@ # # https://github.com/martinmoene/optional-lite # -# This code is licensed under the MIT License (MIT). +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt) cmake_minimum_required( VERSION 3.0 ) diff --git a/test/optional-main.t.cpp b/test/optional-main.t.cpp index d03d15b..0840de7 100644 --- a/test/optional-main.t.cpp +++ b/test/optional-main.t.cpp @@ -2,7 +2,8 @@ // // https://github.com/martinmoene/optional-lite // -// This code is licensed under the MIT License (MIT). +// Distributed under the Boost Software License, Version 1.0. +// (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #include "optional-main.t.h" diff --git a/test/optional-main.t.h b/test/optional-main.t.h index 314a14a..b750b83 100644 --- a/test/optional-main.t.h +++ b/test/optional-main.t.h @@ -2,7 +2,8 @@ // // https://github.com/martinmoene/optional-lite // -// This code is licensed under the MIT License (MIT). +// Distributed under the Boost Software License, Version 1.0. +// (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #pragma once diff --git a/test/optional.t.cpp b/test/optional.t.cpp index 1be1bd9..23dd1b8 100644 --- a/test/optional.t.cpp +++ b/test/optional.t.cpp @@ -1,5 +1,5 @@ // -// Copyright 2014-2017 by Martin Moene +// Copyright 2014-2018 by Martin Moene // // 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)