TartanLlama/optional
1
0
Fork 1
mirror of https://github.com/TartanLlama/optional.git synced 2025-07-29 17:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from IDragnev/fix_readme

Browse Source 
Fix mistakes in README.md
This commit is contained in:
Sy Brand
2019-09-21 21:34:15 +01:00
committed by GitHub
parent 83a0b49e5e 2673f3f9b3
commit e165e3554c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -56,10 +56,10 @@ The interface is the same as `std::optional`, but the following member functions
* `tl::optional<std::size_t> s = opt_string.map_or(&std::string::size, 0);` * `tl::optional<std::size_t> s = opt_string.map_or(&std::string::size, 0);`
- `map_or_else`: carries out a `map` if there is a value, otherwise returns the result of a given default function. - `map_or_else`: carries out a `map` if there is a value, otherwise returns the result of a given default function.
* `std::size_t get_default();` * `std::size_t get_default();`
* `tl::optional<std::size_t> s = opt_string.map_or(&std::string::size, get_default);` * `tl::optional<std::size_t> s = opt_string.map_or_else(&std::string::size, get_default);`
- `conjunction`: returns the argument if a value is stored in the optional, otherwise an empty optional. - `conjunction`: returns the argument if a value is stored in the optional, otherwise an empty optional.
* `tl::make_optional(42).conjunction(13); //13` * `tl::make_optional(42).conjunction(13); //13`
* `tl::optional<int>){}.conjunction(13); //empty` * `tl::optional<int>{}.conjunction(13); //empty`
- `disjunction`: returns the argument if the optional is empty, otherwise the current value. - `disjunction`: returns the argument if the optional is empty, otherwise the current value.
* `tl::make_optional(42).disjunction(13); //42` * `tl::make_optional(42).disjunction(13); //42`
* `tl::optional<int>{}.disjunction(13); //13` * `tl::optional<int>{}.disjunction(13); //13`
@ -73,7 +73,7 @@ int i = 42;
tl::optional<int&> o = i; tl::optional<int&> o = i;
*o == 42; //true *o == 42; //true
i = 12; i = 12;
*o = 12; //true *o == 12; //true
&*o == &i; //true &*o == &i; //true
``` ```