diff options
author | Naushir Patuck <naush@raspberrypi.com> | 2020-10-06 10:07:31 +0100 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-10-07 04:58:39 +0300 |
commit | bb6167873ee309da12ed71c7943d54823e4b6709 (patch) | |
tree | d5085133d1059305525c408f6ee7e9b80a39a43f /src/ipa/raspberrypi/controller | |
parent | dcc47ff715ef1a8b97df53c810ec0c4b069b06e5 (diff) |
pipeline: ipa: raspberrypi: Switch to use C++17 features where possible
With the recent change to use C++17, the following code changes can be
made:
- Use C++17 [[fallthough]] attribute instead of /* Fall through */.
- Swap boost::any to std::any.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/ipa/raspberrypi/controller')
-rw-r--r-- | src/ipa/raspberrypi/controller/metadata.hpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/ipa/raspberrypi/controller/metadata.hpp b/src/ipa/raspberrypi/controller/metadata.hpp index f3a8dfab..4f44ffc6 100644 --- a/src/ipa/raspberrypi/controller/metadata.hpp +++ b/src/ipa/raspberrypi/controller/metadata.hpp @@ -8,13 +8,12 @@ // A simple class for carrying arbitrary metadata, for example about an image. +#include <any> #include <string> #include <mutex> #include <map> #include <memory> -#include <boost/any.hpp> - namespace RPiController { class Metadata @@ -31,7 +30,7 @@ public: auto it = data_.find(tag); if (it == data_.end()) return -1; - value = boost::any_cast<T>(it->second); + value = std::any_cast<T>(it->second); return 0; } void Clear() @@ -53,7 +52,7 @@ public: auto it = data_.find(tag); if (it == data_.end()) return nullptr; - return boost::any_cast<T>(&it->second); + return std::any_cast<T>(&it->second); } template<typename T> void SetLocked(std::string const &tag, T const &value) @@ -69,7 +68,7 @@ public: private: mutable std::mutex mutex_; - std::map<std::string, boost::any> data_; + std::map<std::string, std::any> data_; }; typedef std::shared_ptr<Metadata> MetadataPtr; |