From 217d17107d9082aff464ffe0f9ba4a5cf6a0c910 Mon Sep 17 00:00:00 2001 From: Michael Ploujnikov Date: Thu, 14 Jan 2010 20:57:45 -0500 Subject: [PATCH] Use a fully qualified name for PlacementMO in PlacementIndex This seems to satisfy g++ 4.4.2, which otherwise complains like this: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In file included from ../src/proc/mobject/session/session-impl.hpp:53, from ../src/proc/mobject/session/sess-manager-impl.hpp:28, from ../src/proc/mobject/session/sess-manager-impl.cpp:41: ../src/proc/mobject/session/placement-index.hpp:163: error: declaration of ‘typedef class mobject::Placement mobject::session::PlacementIndex::PlacementMO’ ../src/proc/mobject/placement.hpp:244: error: changes meaning of ‘PlacementMO’ from ‘typedef class mobject::Placement mobject::PlacementMO’ --- src/proc/mobject/session/placement-index.cpp | 2 +- src/proc/mobject/session/placement-index.hpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/proc/mobject/session/placement-index.cpp b/src/proc/mobject/session/placement-index.cpp index f55e6fc3a..036fff3f4 100644 --- a/src/proc/mobject/session/placement-index.cpp +++ b/src/proc/mobject/session/placement-index.cpp @@ -95,7 +95,7 @@ namespace session { /* some type shorthands */ - typedef PlacementIndex::PlacementMO PlacementMO; + typedef mobject::PlacementMO PlacementMO; typedef PlacementIndex::PRef PRef; typedef PlacementIndex::ID ID; diff --git a/src/proc/mobject/session/placement-index.hpp b/src/proc/mobject/session/placement-index.hpp index a8df50b2a..2da6540b0 100644 --- a/src/proc/mobject/session/placement-index.hpp +++ b/src/proc/mobject/session/placement-index.hpp @@ -160,7 +160,6 @@ namespace session { public: - typedef Placement PlacementMO; typedef PlacementRef PRef; typedef PlacementMO::ID const& ID;