King_DuckZ/orotool
1
0
Fork 0
Code Issues 3 Pull requests Releases Wiki Activity

Replace boost::optional with std::optional

Browse source
This commit is contained in:
King_DuckZ 2020-08-15 01:45:35 +01:00
parent 29f11d3f57
commit afb4fd2d4d
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/oro/api.cpp
View file

@ -44,9 +44,9 @@ BOOST_FUSION_ADAPT_STRUCT(
(std::string, unique_name)
(std::string, name)
(oro::ItemTypeWrapper, type)
(boost::optional<oro::ItemSubtypeWrapper>, subtype)
(std::optional<oro::ItemSubtypeWrapper>, subtype)
(unsigned int, npc_price)
(boost::optional<unsigned int>, slots)
(std::optional<unsigned int>, slots)
)
BOOST_FUSION_ADAPT_STRUCT(
@ -84,9 +84,9 @@ BOOST_FUSION_ADAPT_STRUCT(
(unsigned int, refine)
(std::vector<unsigned int>, cards)
(unsigned int, star_crumbs)
(boost::optional<std::string>, element)
(boost::optional<unsigned int>, creator)
(boost::optional<bool>, beloved)
(std::optional<std::string>, element)
(std::optional<unsigned int>, creator)
(std::optional<bool>, beloved)
)
BOOST_FUSION_ADAPT_STRUCT(

6
src/oro/items.hpp
View file

@ -20,7 +20,7 @@
#include "datatypes.hpp"
#include <vector>
#include <string>
#include <boost/optional.hpp>
#include <optional>
namespace oro {
enum class ItemType {
@ -102,9 +102,9 @@ namespace oro {
std::string unique_name;
std::string name;
ItemTypeWrapper type;
boost::optional<ItemSubtypeWrapper> subtype;
std::optional<ItemSubtypeWrapper> subtype;
unsigned int npc_price;
boost::optional<unsigned int> slots;
std::optional<unsigned int> slots;
};
struct Items : BaseJsonReply {

2
src/oro/originsdb.cpp
View file

@ -158,7 +158,7 @@ namespace {
};
template <typename CastT=void, typename T=void>
void bind (SQLite::Statement& st, int idx, const boost::optional<T>& val) {
void bind (SQLite::Statement& st, int idx, const std::optional<T>& val) {
if (val) {
if constexpr (std::is_same_v<T, CastT> or std::is_same_v<void, CastT>) {
st.bind(idx, *val);

8
src/oro/shops.hpp
View file

@ -20,7 +20,7 @@
#include "datatypes.hpp"
#include <vector>
#include <string>
#include <boost/optional.hpp>
#include <optional>
namespace oro {
enum class ShopType {
@ -52,9 +52,9 @@ namespace oro {
unsigned int refine{};
std::vector<unsigned int> cards;
unsigned int star_crumbs{};
boost::optional<std::string> element;
boost::optional<unsigned int> creator;
boost::optional<bool> beloved;
std::optional<std::string> element;
std::optional<unsigned int> creator;
std::optional<bool> beloved;
};
struct Shop {