From 576c9454cfc9529852a7b0da3e5bfb465fb4baa5 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Fri, 18 Jan 2019 15:04:15 +0200
Subject: libcamera: utils: Don't use C++17 nested namespaces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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@google.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 src/libcamera/include/utils.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h
index a2e450b3..73fa2e69 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__ */
-- 
cgit v1.2.1