Changeset 49517 in vbox

Timestamp:

Nov 16, 2013 7:23:21 AM (11 years ago)

Author:

vboxsync

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

90687

Message:

Main: NetworkServiceRunner dependencies included in NetworkServiceRunner.h
(reverts: r90651,r90653,r90654)

Location:

trunk/src/VBox/Main

Files:

• include/NetworkServiceRunner.h (modified) (1 diff)
• src-client/ConsoleImpl2.cpp (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (1 diff)
• src-server/xpcom/server.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/NetworkServiceRunner.h

@@ -21 +21 @@
 #include <iprt/mem.h>
 #include <VBox/com/string.h>
+
+#include <string>
 
 #define TRUNKTYPE_WHATEVER "whatever"

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

@@ -116 +116 @@
 #endif /* VBOX_WITH_NETFLT */
 
-#include <string>
-/* XXX: We don't need class declared in NetworkServiceRunner, this file included because of
- * mcrodefintions TRUNKTYPE_*
- */
 #include "NetworkServiceRunner.h"
 #include "BusAssignmentManager.h"

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

@@ -47 +47 @@
 #include <algorithm>
 #include <set>
-#include <string>
 #include <vector>
 #include <memory> // for auto_ptr

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

@@ -51 +51 @@
 #include <sys/stat.h>
 #include <sys/resource.h>
-
-#include <string>
 
 /////////////////////////////////////////////////////////////////////////////