From bd563c20aa10cea8f6fba9c1f7582893b9bd5438 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Tue, 8 Dec 2009 00:01:05 +0000 Subject: [PATCH] GCC4 build fixes. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34547 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/media/DormantNodeManager.cpp | 8 ++++---- src/kits/media/TimeSourceObjectManager.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/kits/media/DormantNodeManager.cpp b/src/kits/media/DormantNodeManager.cpp index c163b2548e..ccfaf7e97a 100644 --- a/src/kits/media/DormantNodeManager.cpp +++ b/src/kits/media/DormantNodeManager.cpp @@ -63,14 +63,14 @@ #include -static BPrivate::media::DormantNodeManager manager; -BPrivate::media::DormantNodeManager* gDormantNodeManager = &manager; - - namespace BPrivate { namespace media { +static DormantNodeManager sManager; +DormantNodeManager* gDormantNodeManager = &sManager; + + DormantNodeManager::DormantNodeManager() : fLock("dormant node manager locker") diff --git a/src/kits/media/TimeSourceObjectManager.cpp b/src/kits/media/TimeSourceObjectManager.cpp index fa1333422e..c50a6ee887 100644 --- a/src/kits/media/TimeSourceObjectManager.cpp +++ b/src/kits/media/TimeSourceObjectManager.cpp @@ -22,14 +22,14 @@ #include "TimeSourceObject.h" -static BPrivate::media::TimeSourceObjectManager sManager; -BPrivate::media::TimeSourceObjectManager* gTimeSourceObjectManager = &sManager; - - namespace BPrivate { namespace media { +static TimeSourceObjectManager sManager; +TimeSourceObjectManager* gTimeSourceObjectManager = &sManager; + + TimeSourceObjectManager::TimeSourceObjectManager() : BLocker("time source object manager")