clean up the mess with the inclusion of defsregistry.hpp,

caused by the definition of DefsRegistry not being visible for DefsManager's dtor.
This commit is contained in:
Fischlurch 2008-09-09 06:16:42 +02:00
parent 126e552f1b
commit d651ce4762
6 changed files with 19 additions and 8 deletions

View file

@ -35,7 +35,7 @@ This code is heavily inspired by
#define LUMIERA_SINGLETONFACTORY_H
#include "common/singletonpolicies.hpp" ///< several Policies usable together with SingletonFactory
#include "common/singletonpolicies.hpp" // several Policies usable together with SingletonFactory
#include "common/util.hpp"
#include "proc/nobugcfg.hpp"

View file

@ -51,6 +51,13 @@ namespace mobject
}
/** @internal causes boost::checked_delete from \c scoped_ptr<DefsRegistry>
* to be placed here, where the declaration of DefsRegistry is available.*/
DefsManager::~DefsManager() {}
template<class TAR>
P<TAR>
DefsManager::search (const Query<TAR>& capabilities)

View file

@ -33,14 +33,15 @@
namespace mobject
{
namespace session
{
namespace mobject {
namespace session {
using lumiera::P;
using boost::scoped_ptr;
class DefsRegistry;
class SessManagerImpl;
/**
@ -63,6 +64,8 @@ namespace mobject
friend class SessManagerImpl;
public:
~DefsManager ();
/** common access point: retrieve the default object fulfilling
* some given conditions. May silently trigger object creation.
* @throw error::Config in case no solution is possible, which

View file

@ -32,9 +32,8 @@
#include "proc/mobject/session.hpp"
#include "proc/mobject/session/sessionimpl.hpp"
#include "proc/mobject/session/defsmanager.hpp"
#include "proc/mobject/session/defsregistry.hpp"
#include "proc/mobject/session/sessionimpl.hpp"
#include "common/singleton.hpp"

View file

@ -94,6 +94,8 @@ namespace mobject
friend class lumiera::singleton::StaticCreate<SessManagerImpl>;
public:
virtual ~SessManagerImpl() {}
virtual void clear () ;
virtual void reset () ;
virtual void load () ;

View file

@ -39,7 +39,7 @@
#include "proc/mobject/session.hpp"
#include "proc/mobject/session/sessionimpl.hpp"
#include "proc/mobject/session/defsmanager.hpp"
#include "proc/mobject/session/defsregistry.hpp"
//#include "proc/mobject/session/defsregistry.hpp"
#include "common/error.hpp"
using boost::scoped_ptr;