Re-license under Boost Software License (BSL)

martinmoene · martinmoene · commit 0e6c6aa3dc98 · 2018-06-05T08:36:08.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,9 @@
-# Copyright 2017 by Martin Moene
+# Copyright 2017-2018 by Martin Moene
 #
 # https://github.com/martinmoene/optional-bare
 #
-# 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
diff --git a/LICENSE.txt 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
@@ -1,6 +1,6 @@
 optional bare - A simple single-file header-only version of a C++17-like optional for default-constructible, copyable types, for C++98 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-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-bare.svg?branch=master)](https://travis-ci.org/martinmoene/optional-bare) [![Build status](https://ci.appveyor.com/api/projects/status/xl1lrm4cfdi08431?svg=true)](https://ci.appveyor.com/project/martinmoene/optional-bare) [![Version](https://badge.fury.io/gh/martinmoene%2Foptional-bare.svg)](https://github.com/martinmoene/optional-bare/releases) [![download](https://img.shields.io/badge/latest%20version%20%20-download-blue.svg)](https://raw.githubusercontent.com/martinmoene/optional-bare/master/include/nonstd/optional.hpp) [![Try it online](https://img.shields.io/badge/try%20it-online-blue.svg)](https://wandbox.org/permlink/YAWZ1gyu1zDFGh9V)
+[![Language](https://img.shields.io/badge/language-C++-blue.svg)](https://isocpp.org/)  [![Standard](https://img.shields.io/badge/c%2B%2B-98-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-bare.svg?branch=master)](https://travis-ci.org/martinmoene/optional-bare) [![Build status](https://ci.appveyor.com/api/projects/status/xl1lrm4cfdi08431?svg=true)](https://ci.appveyor.com/project/martinmoene/optional-bare) [![Version](https://badge.fury.io/gh/martinmoene%2Foptional-bare.svg)](https://github.com/martinmoene/optional-bare/releases) [![download](https://img.shields.io/badge/latest%20version%20%20-download-blue.svg)](https://raw.githubusercontent.com/martinmoene/optional-bare/master/include/nonstd/optional.hpp) [![Try it online](https://img.shields.io/badge/try%20it-online-blue.svg)](https://wandbox.org/permlink/YAWZ1gyu1zDFGh9V)
 
 **Contents**  
 - [Example usage](#example-usage)
@@ -61,7 +61,7 @@ For more examples, see [this answer on StackOverflow](http://stackoverflow.com/a
 
 License
 -------
-*optional bare* uses the [MIT](LICENSE) license.
+*optional bare* is distributed under the [Boost Software License](LICENSE.txt).
  
 
 Dependencies
diff --git a/include/nonstd/optional.hpp b/include/nonstd/optional.hpp
@@ -1,22 +1,15 @@
 //
-// Copyright (c) 2017 Martin Moene
+// Copyright 2017-2018 by Martin Moene
 //
 // https://github.com/martinmoene/optional-bare
 //
-// 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)
 
 #ifndef NONSTD_OPTIONAL_BARE_HPP
 #define NONSTD_OPTIONAL_BARE_HPP
 
-#define optional_bare_VERSION "0.0.0"
+#define optional_bare_VERSION "1.0.0"
 
 #include <cassert>
 #include <stdexcept>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,8 +1,9 @@
-# Copyright 2017 by Martin Moene
+# Copyright 2017-2018 by Martin Moene
 #
 # https://github.com/martinmoene/optional-bare
 #
-# 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/test/Makefile b/test/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2014 by Martin Moene
+# Copyright 2017-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)
diff --git a/test/optional-bare.t.cpp b/test/optional-bare.t.cpp
@@ -1,8 +1,9 @@
-// Copyright (c) 2017 Martin Moene
+// Copyright 2017-2018 by Martin Moene
 //
 // https://github.com/martinmoene/optional-bare
 //
-// 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-bare.t.h"
 
diff --git a/test/optional-bare.t.h b/test/optional-bare.t.h
@@ -1,8 +1,9 @@
-// Copyright (c) 2017 Martin Moene
+// Copyright 2017-2018 by Martin Moene
 //
 // https://github.com/martinmoene/optional-bare
 //
-// 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
@@ -1,7 +1,8 @@
 //
-// Copyright 2017 by Martin Moene
+// Copyright 2017-2018 by Martin Moene
 //
-// 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)
 //
 // optional bare is derived from optional lite. optional lite is inspired on std::optional
 // by Fernando Cacciola and  Andrzej Krzemienski and on expected lite by Martin Moene.

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`		`-# Copyright 2017 by Martin Moene`
	`1`	`+# Copyright 2017-2018 by Martin Moene`
`2`	`2`	`#`
`3`	`3`	`# https://github.com/martinmoene/optional-bare`
`4`	`4`	`#`
`5`		`-# This code is licensed under the MIT License (MIT).`
	`5`	`+# Distributed under the Boost Software License, Version 1.0.`
	`6`	`+# (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)`
`6`	`7`
`7`	`8`	`cmake_minimum_required( VERSION 2.8.12 )`
`8`	`9`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright 2014 by Martin Moene`
	`1`	`+# Copyright 2017-2018 by Martin Moene`
`2`	`2`	`#`
`3`	`3`	`# Distributed under the Boost Software License, Version 1.0. (See accompanying`
`4`	`4`	`# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)`