vbox的更動 55645 路徑 trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp

時間撮記:

2015-5-4 下午01:39:18 (10 年 以前)

作者:

vboxsync

訊息:

Removed 106 #ifdef/#ifndef VBOX_WITH_GUEST_CONTROL statements that was never really necessary.

檔案:

• trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp (修改) (8 筆差異)

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

@@ -1 @@
-
 /* $Id$ */
 /** @file
@@ -6 +5 @@
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +20 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#ifndef VBOX_WITH_GUEST_CONTROL
+# error "VBOX_WITH_GUEST_CONTROL must defined in this file"
+#endif
 #include "GuestDirectoryImpl.h"
 #include "GuestSessionImpl.h"
@@ -73 +75 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-#ifndef VBOX_WITH_GUEST_CONTROL
-    autoInitSpan.setSucceeded();
-    return VINF_SUCCESS;
-#else
     int vrc = bindToSession(pConsole, pSession, uDirID /* Object ID */);
     if (RT_SUCCESS(vrc))
@@ -124 +122 @@
 
     return vrc;
-#endif /* VBOX_WITH_GUEST_CONTROL */
 }
 
@@ -265 +262 @@
 HRESULT GuestDirectory::close()
 {
-#ifndef VBOX_WITH_GUEST_CONTROL
-    ReturnComNotImplemented();
-#else
     LogFlowThisFuncEnter();
 
@@ -305 +299 @@
     LogFlowThisFunc(("Returning rc=%Rrc\n", rc));
     return hr;
-#endif /* VBOX_WITH_GUEST_CONTROL */
 }
 
 HRESULT GuestDirectory::read(ComPtr<IFsObjInfo> &aObjInfo)
 {
-#ifndef VBOX_WITH_GUEST_CONTROL
-    ReturnComNotImplemented();
-#else
     LogFlowThisFuncEnter();
 
@@ -407 +397 @@
     LogFlowThisFunc(("Returning rc=%Rrc\n", rc));
     return hr;
-#endif /* VBOX_WITH_GUEST_CONTROL */
-}
-
+}
+