diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bc3983..7639c47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ cmake_minimum_required( VERSION 3.5 FATAL_ERROR ) project( optional_lite - VERSION 3.1.1 + VERSION 3.2.0 # DESCRIPTION "A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library" # HOMEPAGE_URL "https://github.com/martinmoene/optional-lite" LANGUAGES CXX ) diff --git a/README.md b/README.md index 767ead4..d13bd74 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/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/on-conan-blue.svg)](https://bintray.com/martinmoene/nonstd-lite/optional-lite%3Anonstd-lite/_latestVersion) [![Try it online](https://img.shields.io/badge/on-wandbox-blue.svg)](https://wandbox.org/permlink/5lJEycDPjE6e02fV) +[![Language](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/on-conan-blue.svg)](https://bintray.com/martinmoene/nonstd-lite/optional-lite%3Anonstd-lite/_latestVersion) [![Try it online](https://img.shields.io/badge/on-wandbox-blue.svg)](https://wandbox.org/permlink/bfZdDT4WerPNZi6b) **Contents** - [Example usage](#example-usage) @@ -440,6 +440,7 @@ optional: Allows to obtain moved-value via value() (C++11) optional: Allows to obtain value or default via value_or() optional: Allows to obtain moved-value or moved-default via value_or() (C++11) optional: Throws bad_optional_access at disengaged access +optional: Throws bad_optional_access with non-empty what() optional: Allows to reset content optional: Allows to swaps engage state and values (non-member) optional: Provides relational operators diff --git a/conanfile.py b/conanfile.py index 46c8868..25d7afe 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,7 +1,7 @@ from conans import ConanFile, CMake class OptionalLiteConan(ConanFile): - version = "3.1.1" + version = "3.2.0" name = "optional-lite" description = "A single-file header-only version of a C++17-like optional, a nullable object for C++98, C++11 and later" license = "Boost Software License - Version 1.0. http://www.boost.org/LICENSE_1_0.txt" diff --git a/include/nonstd/optional.hpp b/include/nonstd/optional.hpp index d05d1c5..33a9b98 100644 --- a/include/nonstd/optional.hpp +++ b/include/nonstd/optional.hpp @@ -12,8 +12,8 @@ #define NONSTD_OPTIONAL_LITE_HPP #define optional_lite_MAJOR 3 -#define optional_lite_MINOR 1 -#define optional_lite_PATCH 1 +#define optional_lite_MINOR 2 +#define optional_lite_PATCH 0 #define optional_lite_VERSION optional_STRINGIFY(optional_lite_MAJOR) "." optional_STRINGIFY(optional_lite_MINOR) "." optional_STRINGIFY(optional_lite_PATCH) diff --git a/project/CodeBlocks/optional-lite.cbp b/project/CodeBlocks/optional-lite.cbp index 5b9a510..3e81478 100644 --- a/project/CodeBlocks/optional-lite.cbp +++ b/project/CodeBlocks/optional-lite.cbp @@ -19,6 +19,7 @@ +