From a31c8f02b9965ebe5b7d4347e4316172e4b7e8d0 Mon Sep 17 00:00:00 2001 From: Umang Jain Date: Tue, 19 Oct 2021 17:18:02 +0530 Subject: android: camera_metadata: Rename get() to getMetadata() Rename CameraMetadata::get() to CameraMetadata::getMetadata() to avoid confusion with std::unique_ptr::get() when CameraMetadata is used with a std::unique_ptr. No functional changes intended in this patch. Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Signed-off-by: Umang Jain --- src/android/camera_metadata.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/android/camera_metadata.h') diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h index 60be416c..8555c7c3 100644 --- a/src/android/camera_metadata.h +++ b/src/android/camera_metadata.h @@ -85,8 +85,8 @@ public: return updateEntry(tag, data, count, sizeof(T)); } - camera_metadata_t *get(); - const camera_metadata_t *get() const; + camera_metadata_t *getMetadata(); + const camera_metadata_t *getMetadata() const; private: bool resize(size_t count, size_t size); -- cgit v1.2.1