Changeset 62358 in vbox

Timestamp:

Jul 20, 2016 2:03:37 PM (8 years ago)

Author:

vboxsync

Message:

*: renamed RT_GCC_NO_DEPRECATED_BEGIN/END => RT_GCC_NO_WARN_DEPRECATED_BEGIN/END and added RT_GCC_NO_WARN_CONVERSION_BEGIN/END

Location:

trunk

Files:

• include/VBox/HostServices/Service.h (modified) (2 diffs)
• include/iprt/cdefs.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp (modified) (2 diffs)
• src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (1 diff)

trunk/include/VBox/HostServices/Service.h

@@ -358 +358 @@
             else
             {
-                RT_GCC_NO_DEPRECATED_BEGIN
+                RT_GCC_NO_WARN_DEPRECATED_BEGIN
                 std::auto_ptr<AbstractService> apService;
                 /* No exceptions may propagate outside. */
@@ -371 +371 @@
                     rc = VERR_UNRESOLVED_ERROR;
                 }
-                RT_GCC_NO_DEPRECATED_END
+                RT_GCC_NO_WARN_DEPRECATED_END
                 if (RT_SUCCESS(rc))
                 {

trunk/include/iprt/cdefs.h

@@ -988 +988 @@
 #endif
 
+/** @def RT_GCC_NO_WARN_DEPRECATED_BEGIN
+ * Used to start a block of code where GCC should not warn about deprecated
+ * declarations. */
 #if RT_GNUC_PREREQ(4, 6)
-# define RT_GCC_NO_DEPRECATED_BEGIN \
+# define RT_GCC_NO_WARN_DEPRECATED_BEGIN \
    _Pragma("GCC diagnostic push") \
    _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-# define RT_GCC_NO_DEPRECATED_END \
+/** @def RT_GCC_NO_WARN_DEPRECATED_END
+ * Used to end a block of code where GCC should not warn about deprecated
+ * declarations. */
+# define RT_GCC_NO_WARN_DEPRECATED_END \
    _Pragma("GCC diagnostic pop")
 #else
-# define RT_GCC_NO_DEPRECATED_BEGIN
-# define RT_GCC_NO_DEPRECATED_END
+# define RT_GCC_NO_WARN_DEPRECATED_BEGIN
+# define RT_GCC_NO_WARN_DEPRECATED_END
+#endif
+
+/** @def RT_GCC_NO_WARN_CONVERSION_BEGIN
+ * Used to start a block of code where GCC should not warn about implicit
+ * conversions that may alter a value. */
+#if RT_GNUC_PREREQ(4, 4)
+# define RT_GCC_NO_WARN_CONVERSION_BEGIN \
+   _Pragma("GCC diagnostic push") \
+   _Pragma("GCC diagnostic ignored \"-Wconversion\"")
+/** @def RT_GCC_NO_WARN_CONVERSION_END
+ * Used to end a block of code where GCC should not warn about implicit
+ * conversions that may alter a value. */
+# define RT_GCC_NO_WARN_CONVERSION_END \
+   _Pragma("GCC diagnostic pop")
+#else
+# define RT_GCC_NO_WARN_CONVERSION_BEGIN
+# define RT_GCC_NO_WARN_CONVERSION_END
 #endif
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp

@@ -703 +703 @@
             /* Parse key-event: */
             xcb_key_press_event_t *pKeyEvent = static_cast<xcb_key_press_event_t*>(pMessage);
-            RT_GCC_NO_DEPRECATED_BEGIN
+            RT_GCC_NO_WARN_DEPRECATED_BEGIN
             const KeySym ks = ::XKeycodeToKeysym(QX11Info::display(), pKeyEvent->detail, 0);
-            RT_GCC_NO_DEPRECATED_END
+            RT_GCC_NO_WARN_DEPRECATED_END
             const int iKeySym = static_cast<const int>(ks);
 
@@ -840 +840 @@
             /* Get key-code: */
             XKeyEvent *pKeyEvent = (XKeyEvent*)pEvent;
-            RT_GCC_NO_DEPRECATED_BEGIN
+            RT_GCC_NO_WARN_DEPRECATED_BEGIN
             KeySym ks = ::XKeycodeToKeysym(pKeyEvent->display, pKeyEvent->keycode, 0);
-            RT_GCC_NO_DEPRECATED_END
+            RT_GCC_NO_WARN_DEPRECATED_END
 
             int iKeySym = (int)ks;

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -2169 +2169 @@
 
     /* Initialize our worker task. */
-    RT_GCC_NO_DEPRECATED_BEGIN
+    RT_GCC_NO_WARN_DEPRECATED_BEGIN
     std::auto_ptr<GuestSessionTask> task(pTask);
-    RT_GCC_NO_DEPRECATED_END
+    RT_GCC_NO_WARN_DEPRECATED_END
     int rc = task->RunAsync(strTaskDesc, pProgress);
     if (RT_FAILURE(rc))