Changeset 105873 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Aug 27, 2024 2:52:54 PM (8 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

164593

Message:

IPRT/cpp/utils: Moved MY_VECTOR_ASSIGN_ARRAY into IPRT and renamed it to RT_CPP_VECTOR_ASSIGN_ARRAY. Macro was needed in several modules (to avoid code duplication).

File:

• trunk/src/VBox/Main/src-all/PlatformPropertiesImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-all/PlatformPropertiesImpl.cpp

@@ -45 +45 @@
 
 
-// defines
-/////////////////////////////////////////////////////////////////////////////
-
-/** @def MY_VECTOR_ASSIGN_ARRAY
- * Safe way to copy an array (static + const) into a vector w/ minimal typing.
- *
- * @param a_rVector     The destination vector reference.
- * @param a_aSrcArray   The source array to assign to the vector.
- */
-#if RT_GNUC_PREREQ(13, 0) && !RT_GNUC_PREREQ(14, 0) && defined(VBOX_WITH_GCC_SANITIZER)
-/* Workaround for g++ 13.2 incorrectly failing on arrays with a single entry in ASAN builds.
-   This is restricted to [13.0, 14.0), assuming the issue was introduced in the 13 cycle
-   and will be fixed by the time 14 is done.  If 14 doesn't fix it, extend the range
-   version by version till it is fixed. */
-# define MY_VECTOR_ASSIGN_ARRAY(a_rVector, a_aSrcArray) do { \
-        _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wstringop-overread\""); \
-        (a_rVector).assign(&a_aSrcArray[0], &a_aSrcArray[RT_ELEMENTS(a_aSrcArray)]); \
-        _Pragma("GCC diagnostic pop"); \
-    } while (0)
-#else
-# define MY_VECTOR_ASSIGN_ARRAY(a_rVector, a_aSrcArray) do { \
-        (a_rVector).assign(&a_aSrcArray[0], &a_aSrcArray[RT_ELEMENTS(a_aSrcArray)]); \
-    } while (0)
-#endif
-
-
 /*
  * PlatformProperties implementation.
@@ -877 +851 @@
 # endif
             };
-            MY_VECTOR_ASSIGN_ARRAY(vecSupportedGraphicsFeatures, s_aGraphicsFeatures);
+            RT_CPP_VECTOR_ASSIGN_ARRAY(vecSupportedGraphicsFeatures, s_aGraphicsFeatures);
             break;
         }
@@ -889 +863 @@
                 GraphicsFeature_None
             };
-            MY_VECTOR_ASSIGN_ARRAY(vecSupportedGraphicsFeatures, s_aGraphicsFeatures);
+            RT_CPP_VECTOR_ASSIGN_ARRAY(vecSupportedGraphicsFeatures, s_aGraphicsFeatures);
             break;
         }