[libcamera-devel] libcamera: stream: Include missing array header

Message ID 20190619144158.28900-1-laurent.pinchart@ideasonboard.com
State Accepted
Commit 329b38d2541c84e16b2cf2d8f6ad7af87eec2ecd
Headers show
Series
  • [libcamera-devel] libcamera: stream: Include missing array header
Related show

Commit Message

Laurent Pinchart June 19, 2019, 2:41 p.m. UTC
The file uses the std::array class but doesn't include the corresponding
header. This breaks compilation with clang and libc++. Fix it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/libcamera/stream.cpp | 1 +
 1 file changed, 1 insertion(+)

Comments

Laurent Pinchart June 19, 2019, 2:50 p.m. UTC | #1
On Wed, Jun 19, 2019 at 05:41:58PM +0300, Laurent Pinchart wrote:
> The file uses the std::array class but doesn't include the corresponding
> header. This breaks compilation with clang and libc++. Fix it.
> 

Fixes: 63c578ed9993 ("libcamera: stream: Add StreamFormats")

> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  src/libcamera/stream.cpp | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp
> index d60f83246e13..d8e87c62281c 100644
> --- a/src/libcamera/stream.cpp
> +++ b/src/libcamera/stream.cpp
> @@ -8,6 +8,7 @@
>  #include <libcamera/stream.h>
>  
>  #include <algorithm>
> +#include <array>
>  #include <climits>
>  #include <iomanip>
>  #include <sstream>
Niklas Söderlund June 19, 2019, 2:50 p.m. UTC | #2
Hi Laurent,

Thanks for catching this. It's my fault to begin with, sorry about that.

On 2019-06-19 17:41:58 +0300, Laurent Pinchart wrote:
> The file uses the std::array class but doesn't include the corresponding
> header. This breaks compilation with clang and libc++. Fix it.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  src/libcamera/stream.cpp | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp
> index d60f83246e13..d8e87c62281c 100644
> --- a/src/libcamera/stream.cpp
> +++ b/src/libcamera/stream.cpp
> @@ -8,6 +8,7 @@
>  #include <libcamera/stream.h>
>  
>  #include <algorithm>
> +#include <array>
>  #include <climits>
>  #include <iomanip>
>  #include <sstream>
> -- 
> Regards,
> 
> Laurent Pinchart
>
Jacopo Mondi June 19, 2019, 2:50 p.m. UTC | #3
Hi Laurent,
  this one in combination with the patch for formats.cpp I just sent
fixes my build errors on clang and libc++

Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>

If you could review the other patch, we should then push them together

Thanks
  j

On Wed, Jun 19, 2019 at 05:41:58PM +0300, Laurent Pinchart wrote:
> The file uses the std::array class but doesn't include the corresponding
> header. This breaks compilation with clang and libc++. Fix it.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  src/libcamera/stream.cpp | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp
> index d60f83246e13..d8e87c62281c 100644
> --- a/src/libcamera/stream.cpp
> +++ b/src/libcamera/stream.cpp
> @@ -8,6 +8,7 @@
>  #include <libcamera/stream.h>
>
>  #include <algorithm>
> +#include <array>
>  #include <climits>
>  #include <iomanip>
>  #include <sstream>
> --
> Regards,
>
> Laurent Pinchart
>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch

diff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp
index d60f83246e13..d8e87c62281c 100644
--- a/src/libcamera/stream.cpp
+++ b/src/libcamera/stream.cpp
@@ -8,6 +8,7 @@ 
 #include <libcamera/stream.h>
 
 #include <algorithm>
+#include <array>
 #include <climits>
 #include <iomanip>
 #include <sstream>