From 9b66593afd5756473ff1034b504425074a223c2a Mon Sep 17 00:00:00 2001 From: Marco Feuerstein Date: Mon, 27 Nov 2023 19:31:12 +0100 Subject: [PATCH] Revert "Added GenTL namespace when using respective code." This reverts commit 1e1cd1a6973568117522d976728a31f4d4b15ec8. --- src/arvgentldeviceprivate.h | 6 ------ src/arvgentlsystemprivate.h | 6 ------ src/arvmiscprivate.h | 6 ------ 3 files changed, 18 deletions(-) diff --git a/src/arvgentldeviceprivate.h b/src/arvgentldeviceprivate.h index db4153212..f9a871ab4 100644 --- a/src/arvgentldeviceprivate.h +++ b/src/arvgentldeviceprivate.h @@ -31,17 +31,11 @@ #include G_BEGIN_DECLS -#ifdef G_CXX_STD_VERSION -namespace GenTL { -#endif ArvGenTLSystem * arv_gentl_device_get_system (ArvGenTLDevice *device); DS_HANDLE arv_gentl_device_open_stream_handle (ArvGenTLDevice *device); uint64_t arv_gentl_device_get_timestamp_tick_frequency (ArvGenTLDevice *device); -#ifdef G_CXX_STD_VERSION -} /* end of namespace GenTL */ -#endif G_END_DECLS #endif diff --git a/src/arvgentlsystemprivate.h b/src/arvgentlsystemprivate.h index 66e38169f..8e0baab75 100644 --- a/src/arvgentlsystemprivate.h +++ b/src/arvgentlsystemprivate.h @@ -31,9 +31,6 @@ #include G_BEGIN_DECLS -#ifdef G_CXX_STD_VERSION -namespace GenTL { -#endif typedef struct { /* Global functions */ @@ -125,9 +122,6 @@ void arv_gentl_system_close_device_handle (ArvGenTLSystem *system, const char *interface_id, DEV_HANDLE *device_handle); -#ifdef G_CXX_STD_VERSION -} /* end of namespace GenTL */ -#endif G_END_DECLS #endif diff --git a/src/arvmiscprivate.h b/src/arvmiscprivate.h index e83e1c2d5..be06c8078 100644 --- a/src/arvmiscprivate.h +++ b/src/arvmiscprivate.h @@ -88,13 +88,7 @@ ARV_API const char * arv_vendor_alias_lookup (const char *vendor const char * arv_protocol_from_transport_layer_type (const char *transport_layer_type); const char * arv_protocol_to_transport_layer_type (const char *protocol); -#ifdef G_CXX_STD_VERSION -namespace GenTL { -#endif const char * arv_gentl_gc_error_to_string (GC_ERROR error); -#ifdef G_CXX_STD_VERSION -} /* end of namespace GenTL */ -#endif /* this only wraps g_get_monotonic_time on non-windows platforms */ gint64 arv_monotonic_time_us (void);