[libcamera-devel] android: Drop gcc 7 compatibility
diff mbox series

Message ID 20220519185404.16502-1-laurent.pinchart@ideasonboard.com
State Accepted
Commit 0c1b3f5e4c5f36c19d702529d4b597415f813394
Headers show
Series
  • [libcamera-devel] android: Drop gcc 7 compatibility
Related show

Commit Message

Laurent Pinchart May 19, 2022, 6:54 p.m. UTC
Now that we have dropped gcc 7 support, remove the compatibility with
gcc versions older than 8 that implemented the filesystem API in the
std::experimental namespace.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/android/camera_hal_config.cpp | 7 -------
 1 file changed, 7 deletions(-)

Comments

Kieran Bingham May 20, 2022, 7:37 a.m. UTC | #1
Quoting Laurent Pinchart via libcamera-devel (2022-05-19 19:54:04)
> Now that we have dropped gcc 7 support, remove the compatibility with
> gcc versions older than 8 that implemented the filesystem API in the
> std::experimental namespace.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

This sounds good.

Wasn't there some (potential) task blocked about using <filesystem>
because of the android hal, which would now be unblocked?

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> ---
>  src/android/camera_hal_config.cpp | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp
> index 29e506ff5e28..28072cb86285 100644
> --- a/src/android/camera_hal_config.cpp
> +++ b/src/android/camera_hal_config.cpp
> @@ -6,14 +6,7 @@
>   */
>  #include "camera_hal_config.h"
>  
> -#if defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 8
> -#include <experimental/filesystem>
> -namespace std {
> -namespace filesystem = std::experimental::filesystem;
> -}
> -#else
>  #include <filesystem>
> -#endif
>  #include <stdlib.h>
>  #include <string>
>  
> -- 
> Regards,
> 
> Laurent Pinchart
>
Laurent Pinchart May 20, 2022, 7:40 a.m. UTC | #2
On Fri, May 20, 2022 at 08:37:35AM +0100, Kieran Bingham wrote:
> Quoting Laurent Pinchart via libcamera-devel (2022-05-19 19:54:04)
> > Now that we have dropped gcc 7 support, remove the compatibility with
> > gcc versions older than 8 that implemented the filesystem API in the
> > std::experimental namespace.
> > 
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> This sounds good.
> 
> Wasn't there some (potential) task blocked about using <filesystem>
> because of the android hal, which would now be unblocked?

Hmmmm... I recall something indeed. Was it that filesystem isn't
available on Android ? That would require us to stop using
std::filesystem, and this patch doesn't go in the opposite direction.

> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> 
> > ---
> >  src/android/camera_hal_config.cpp | 7 -------
> >  1 file changed, 7 deletions(-)
> > 
> > diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp
> > index 29e506ff5e28..28072cb86285 100644
> > --- a/src/android/camera_hal_config.cpp
> > +++ b/src/android/camera_hal_config.cpp
> > @@ -6,14 +6,7 @@
> >   */
> >  #include "camera_hal_config.h"
> >  
> > -#if defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 8
> > -#include <experimental/filesystem>
> > -namespace std {
> > -namespace filesystem = std::experimental::filesystem;
> > -}
> > -#else
> >  #include <filesystem>
> > -#endif
> >  #include <stdlib.h>
> >  #include <string>
> >
Nicolas Dufresne via libcamera-devel May 20, 2022, 7:40 a.m. UTC | #3
On Thu, May 19, 2022 at 09:54:04PM +0300, Laurent Pinchart via libcamera-devel wrote:
> Now that we have dropped gcc 7 support, remove the compatibility with
> gcc versions older than 8 that implemented the filesystem API in the
> std::experimental namespace.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>

> ---
>  src/android/camera_hal_config.cpp | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp
> index 29e506ff5e28..28072cb86285 100644
> --- a/src/android/camera_hal_config.cpp
> +++ b/src/android/camera_hal_config.cpp
> @@ -6,14 +6,7 @@
>   */
>  #include "camera_hal_config.h"
>  
> -#if defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 8
> -#include <experimental/filesystem>
> -namespace std {
> -namespace filesystem = std::experimental::filesystem;
> -}
> -#else
>  #include <filesystem>
> -#endif
>  #include <stdlib.h>
>  #include <string>

Patch
diff mbox series

diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp
index 29e506ff5e28..28072cb86285 100644
--- a/src/android/camera_hal_config.cpp
+++ b/src/android/camera_hal_config.cpp
@@ -6,14 +6,7 @@ 
  */
 #include "camera_hal_config.h"
 
-#if defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 8
-#include <experimental/filesystem>
-namespace std {
-namespace filesystem = std::experimental::filesystem;
-}
-#else
 #include <filesystem>
-#endif
 #include <stdlib.h>
 #include <string>