Changeset 12627 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

Sep 22, 2008 8:58:39 AM (17 years ago)

Author:

vboxsync

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

36903

Message:

FE/Qt: reduce the number of dependencies to iprt/asm.h

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxDefs.h (modified) (2 diffs)
• src/VBoxGlobal.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxDefs.h

@@ -29 +29 @@
 #include <VBox/log.h>
 #include <iprt/assert.h>
-
 #include <iprt/alloc.h>
-#include <iprt/asm.h>
 
 #ifdef VBOX_GUI_DEBUG
@@ -78 +76 @@
 {
 public:
-    inline static uint64_t ticks() {
-        return ASMReadTSC();
-    }
+    /* don't inline this function to not depend on iprt/asm.h here */
+    static uint64_t ticks();
     inline static uint64_t msecs( uint64_t tcks ) {
         return tcks / ticks_per_msec;

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

@@ -103 +103 @@
 #if defined (VBOX_GUI_DEBUG)
 uint64_t VMCPUTimer::ticks_per_msec = (uint64_t) -1LL; // declared in VBoxDefs.h
+uint64_t VMCPUTimer::ticks()
+{
+    return ASMReadTSC();
+}
 #endif