diff options
| author | Oleg Morozenkov <m@oleg.rocks> | 2024-03-04 01:32:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-04 01:32:07 +0300 |
| commit | f7c17f91c64c34f55381f0117b9d8cd8ac55b423 (patch) | |
| tree | 9a470baf7a80df8e5575297b3d34a0b8eeb6d4b0 | |
| parent | f1c2dbad1c9674f82e61b7cf76cdc618a2dba852 (diff) | |
| parent | a92beb1d03d9df51667207b2f529a2a4a39b0d8f (diff) | |
Merge pull request #294 from roynatech2544/patch-1
Fix InputFile::fromFile
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/types/InputFile.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 290d201..d376267 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ option(BUILD_SHARED_LIBS "Build tgbot-cpp shared/static library." OFF) option(BUILD_DOCUMENTATION "Build doxygen API documentation." OFF) # sources -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) if(WIN32) @@ -76,6 +76,7 @@ link_directories(${Boost_LIBRARY_DIR_RELEASE}) if(NOT Boost_USE_STATIC_LIBS) add_definitions(-DBOOST_ALL_DYN_LINK) endif() +add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS) set(LIB_LIST ${CMAKE_THREAD_LIBS_INIT} diff --git a/src/types/InputFile.cpp b/src/types/InputFile.cpp index c74c73e..c4d804d 100644 --- a/src/types/InputFile.cpp +++ b/src/types/InputFile.cpp @@ -1,7 +1,7 @@ #include "tgbot/types/InputFile.h" -#include "tgbot/tools/StringTools.h" #include "tgbot/tools/FileTools.h" +#include <filesystem> #include <memory> #include <string> @@ -13,7 +13,7 @@ InputFile::Ptr InputFile::fromFile(const string& filePath, const string& mimeTyp auto result(make_shared<InputFile>()); result->data = FileTools::read(filePath); result->mimeType = mimeType; - result->fileName = StringTools::split(filePath, '/').back(); + result->fileName = std::filesystem::path(filePath).filename().string(); return result; } |