diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-24 12:14:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-24 12:14:32 +0100 |
| commit | fce29f479ce0b3497fb6f434dd137c6e0c75524e (patch) | |
| tree | 264b5a0f44fb8bb9d2b8748632242fa46e8fdb7a /src/lib/image_filename_sorter.h | |
| parent | 54e0e2ab9a48944004424f423397f8dc54aec8c8 (diff) | |
| parent | b3de36fc3d7c031e40be73b937fc183f82bb0a8c (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomaticv2.13.38
Diffstat (limited to 'src/lib/image_filename_sorter.h')
| -rw-r--r-- | src/lib/image_filename_sorter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/image_filename_sorter.h b/src/lib/image_filename_sorter.h index 2a15639ce..960b1d8a7 100644 --- a/src/lib/image_filename_sorter.h +++ b/src/lib/image_filename_sorter.h @@ -27,5 +27,5 @@ public: bool operator() (boost::filesystem::path a, boost::filesystem::path b); private: - boost::optional<int> extract_numbers (boost::filesystem::path p); + std::string extract_numbers (boost::filesystem::path p); }; |
