[libcamera-devel] [PATCH] libcamera: utils: Don't use C++17 nested namespaces
Laurent Pinchart
laurent.pinchart at ideasonboard.com
Fri Jan 18 14:08:23 CET 2019
Nesting namespace names in a single namespace declaration is a C++17
feature. As libcamera depends on C++11 only, nest two separate namespace
declarations instead.
Reported-by: Shik Chen <shik at google.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
src/libcamera/include/utils.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h
index a2e450b35372..73fa2e69b029 100644
--- a/src/libcamera/include/utils.h
+++ b/src/libcamera/include/utils.h
@@ -11,7 +11,9 @@
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
-namespace libcamera::utils {
+namespace libcamera {
+
+namespace utils {
/* C++11 doesn't provide std::make_unique */
template<typename T, typename... Args>
@@ -20,6 +22,8 @@ std::unique_ptr<T> make_unique(Args&&... args)
return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
}
-} /* namespace libcamera::utils */
+} /* namespace utils */
+
+} /* namespace libcamera */
#endif /* __LIBCAMERA_UTILS_H__ */
--
Regards,
Laurent Pinchart
More information about the libcamera-devel
mailing list