Changeset 81682 in vbox for trunk/src/VBox/Main/src-server/HostImpl.cpp

Timestamp:

Nov 5, 2019 7:08:21 PM (5 years ago)

Author:

vboxsync

Message:

Main/Console+ConsoleVRDPServer+ApplianceExport+Host+Machine+USBDeviceFilters: fix missing RT_NOREF(...) if VBOX_WITH_USB is undefined

File:

• trunk/src/VBox/Main/src-server/HostImpl.cpp (modified) (12 diffs)

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -975 +975 @@
      * extended error info to indicate that USB is simply not available
      * (w/o treating it as a failure), for example, as in OSE. */
-    NOREF(aUSBDevices);
-# ifndef RT_OS_WINDOWS
-    NOREF(aUSBDevices);
-# endif
+    RT_NOREF(aUSBDevices);
     ReturnComNotImplemented();
 #endif
@@ -1032 +1029 @@
      * extended error info to indicate that USB is simply not available
      * (w/o treating it as a failure), for example, as in OSE. */
-    NOREF(aUSBDeviceFilters);
-# ifndef RT_OS_WINDOWS
-    NOREF(aUSBDeviceFilters);
-# endif
+    RT_NOREF(aUSBDeviceFilters);
     ReturnComNotImplemented();
 #endif
@@ -1547 +1541 @@
      * extended error info to indicate that USB is simply not available
      * (w/o treating it as a failure), for example, as in OSE. */
-    NOREF(aName);
-    NOREF(aFilter);
+    RT_NOREF(aName, aFilter);
     ReturnComNotImplemented();
 #endif
@@ -1608 +1601 @@
      * extended error info to indicate that USB is simply not available
      * (w/o treating it as a failure), for example, as in OSE. */
-    NOREF(aPosition);
-    NOREF(aFilter);
+    RT_NOREF(aPosition, aFilter);
     ReturnComNotImplemented();
 #endif
@@ -1662 +1654 @@
      * extended error info to indicate that USB is simply not available
      * (w/o treating it as a failure), for example, as in OSE. */
-    NOREF(aPosition);
+    RT_NOREF(aPosition);
     ReturnComNotImplemented();
 #endif
@@ -1851 +1843 @@
 
 #else   /* !VBOX_WITH_USB */
-    NOREF(aName);
-    NOREF(aDevice);
+    RT_NOREF(aName, aDevice);
     return E_NOTIMPL;
 #endif  /* !VBOX_WITH_USB */
@@ -1886 +1877 @@
 
 #else   /* !VBOX_WITH_USB */
-    NOREF(aId);
-    NOREF(aDevice);
+    RT_NOREF(aId, aDevice);
     return E_NOTIMPL;
 #endif  /* !VBOX_WITH_USB */
@@ -1929 +1919 @@
     return m->pUSBProxyService->addUSBDeviceSource(aBackend, aId, aAddress, aPropertyNames, aPropertyValues);
 #else
+    RT_NOREF(aBackend, aId, aAddress, aPropertyNames, aPropertyValues);
     ReturnComNotImplemented();
 #endif
@@ -1939 +1930 @@
     return m->pUSBProxyService->removeUSBDeviceSource(aId);
 #else
+    RT_NOREF(aId);
     ReturnComNotImplemented();
 #endif
@@ -1980 +1972 @@
     rc = m->pUSBProxyService->i_loadSettings(data.llUSBDeviceSources);
 #else
-    NOREF(data);
+    RT_NOREF(data);
 #endif /* VBOX_WITH_USB */
     return rc;
@@ -2009 +2001 @@
     return m->pUSBProxyService->i_saveSettings(data.llUSBDeviceSources);
 #else
-    NOREF(data);
+    RT_NOREF(data);
     return S_OK;
 #endif /* VBOX_WITH_USB */
@@ -2392 +2384 @@
             }
 #else
-    NOREF(list);
+    RT_NOREF(list);
     /* PORTME */
 #endif