| Message ID | 20260113000808.15395-23-laurent.pinchart@ideasonboard.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
2026. 01. 13. 1:07 keltezéssel, Laurent Pinchart írta: > global_configuration.h uses std::initializer_list, include the > corresponding header. Add a comment in global_configuration.cpp to close > an anonymous namespace, as mandated by the coding style. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> > include/libcamera/internal/global_configuration.h | 1 + > src/libcamera/global_configuration.cpp | 4 +++- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/include/libcamera/internal/global_configuration.h b/include/libcamera/internal/global_configuration.h > index 84bdf90244d9..80b57b38ba03 100644 > --- a/include/libcamera/internal/global_configuration.h > +++ b/include/libcamera/internal/global_configuration.h > @@ -8,6 +8,7 @@ > #pragma once > > #include <filesystem> > +#include <initializer_list> > #include <optional> > #include <string> > #include <string_view> > diff --git a/src/libcamera/global_configuration.cpp b/src/libcamera/global_configuration.cpp > index c853a028c91d..44ed206de78f 100644 > --- a/src/libcamera/global_configuration.cpp > +++ b/src/libcamera/global_configuration.cpp > @@ -24,11 +24,13 @@ > namespace libcamera { > > namespace { > + > const std::vector<std::filesystem::path> globalConfigurationFiles = { > std::filesystem::path(LIBCAMERA_SYSCONF_DIR) / "configuration.yaml", > std::filesystem::path(LIBCAMERA_DATA_DIR) / "configuration.yaml", > }; > -} > + > +} /* namespace */ > > LOG_DEFINE_CATEGORY(Configuration) >
diff --git a/include/libcamera/internal/global_configuration.h b/include/libcamera/internal/global_configuration.h index 84bdf90244d9..80b57b38ba03 100644 --- a/include/libcamera/internal/global_configuration.h +++ b/include/libcamera/internal/global_configuration.h @@ -8,6 +8,7 @@ #pragma once #include <filesystem> +#include <initializer_list> #include <optional> #include <string> #include <string_view> diff --git a/src/libcamera/global_configuration.cpp b/src/libcamera/global_configuration.cpp index c853a028c91d..44ed206de78f 100644 --- a/src/libcamera/global_configuration.cpp +++ b/src/libcamera/global_configuration.cpp @@ -24,11 +24,13 @@ namespace libcamera { namespace { + const std::vector<std::filesystem::path> globalConfigurationFiles = { std::filesystem::path(LIBCAMERA_SYSCONF_DIR) / "configuration.yaml", std::filesystem::path(LIBCAMERA_DATA_DIR) / "configuration.yaml", }; -} + +} /* namespace */ LOG_DEFINE_CATEGORY(Configuration)
global_configuration.h uses std::initializer_list, include the corresponding header. Add a comment in global_configuration.cpp to close an anonymous namespace, as mandated by the coding style. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- include/libcamera/internal/global_configuration.h | 1 + src/libcamera/global_configuration.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-)