Author: anevilyak Date: 2009-12-08 01:01:05 +0100 (Tue, 08 Dec 2009) New Revision: 34547 Changeset: http://dev.haiku-os.org/changeset/34547/haiku Modified: haiku/trunk/src/kits/media/DormantNodeManager.cpp haiku/trunk/src/kits/media/TimeSourceObjectManager.cpp Log: GCC4 build fixes. Modified: haiku/trunk/src/kits/media/DormantNodeManager.cpp =================================================================== --- haiku/trunk/src/kits/media/DormantNodeManager.cpp 2009-12-07 22:56:29 UTC (rev 34546) +++ haiku/trunk/src/kits/media/DormantNodeManager.cpp 2009-12-08 00:01:05 UTC (rev 34547) @@ -63,14 +63,14 @@ #include <DataExchange.h> -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") Modified: haiku/trunk/src/kits/media/TimeSourceObjectManager.cpp =================================================================== --- haiku/trunk/src/kits/media/TimeSourceObjectManager.cpp 2009-12-07 22:56:29 UTC (rev 34546) +++ haiku/trunk/src/kits/media/TimeSourceObjectManager.cpp 2009-12-08 00:01:05 UTC (rev 34547) @@ -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")