Skip to content

Replace boost::optional with std::optional #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
r-bt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace boost::optional with std::optional #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(ble++)
set(PROJECT_VERSION "1.2")
set(PROJECT_DESCRIPTION "Bluetooth LE interface for C++")

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 17)
set(TARGET1_NAME ${PROJECT_NAME} CACHE INTERNAL "")

set(default_build_type "Release")
Expand Down Expand Up @@ -56,7 +56,7 @@ add_library(${PROJECT_NAME} SHARED ${SRC})

target_link_libraries(${PROJECT_NAME} ${BLUEZ_LIBRARIES})
set_target_properties(${PROJECT_NAME} PROPERTIES
CXX_STANDARD 11
CXX_STANDARD 17
CMAKE_CXX_STANDARD_REQUIRED YES
SOVERSION 5)

Expand All @@ -77,7 +77,7 @@ if(WITH_EXAMPLES)

set_target_properties(${example_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY examples)
set_target_properties(${example_name} PROPERTIES
CXX_STANDARD 11
CXX_STANDARD 17
CMAKE_CXX_STANDARD_REQUIRED YES
RUNTIME_OUTPUT_DIRECTORY examples)
endforeach()
Expand Down
7 changes: 4 additions & 3 deletions blepp/lescan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@
#include <stdexcept>
#include <cstdint>
#include <set>
#include <boost/optional.hpp>
#include <optional>
#include <blepp/blestatemachine.h> //for UUID. FIXME mofo
#include <bluetooth/hci.h>
#include <unistd.h>

namespace BLEPP
{
Expand Down Expand Up @@ -79,8 +80,8 @@ namespace BLEPP
bool uuid_32_bit_complete=0;
bool uuid_128_bit_complete=0;

boost::optional<Name> local_name;
boost::optional<Flags> flags;
std::optional<Name> local_name;
std::optional<Flags> flags;

std::vector<std::vector<uint8_t>> manufacturer_specific_data;
std::vector<std::vector<uint8_t>> service_data;
Expand Down
2 changes: 1 addition & 1 deletion examples/lescan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <array>
#include <iomanip>
#include <vector>
#include <boost/optional.hpp>
#include <optional>

#include <signal.h>

Expand Down