Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 4, 2009, 12:02:28 AM (15 years ago)
Author:
rgrieder
Message:

Modified Scoped Singleton concept: Derive from Singleton normally, but place an important pre-main() instruction in the source file: ManageScopedSingleton(className, scope) (it's a macro).
This causes the Singleton to be created and destroyed with the Scope. Thus if a Singleton c'tor throws, it is much easier to react accordingly.

Location:
code/branches/core5/src/modules/questsystem/notifications
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core5/src/modules/questsystem/notifications/NotificationManager.cc

    r5760 r5867  
    3737
    3838#include "core/CoreIncludes.h"
     39#include "core/ScopedSingletonManager.h"
    3940#include "Notification.h"
    4041#include "interfaces/NotificationListener.h"
     
    4748
    4849    NotificationManager* NotificationManager::singletonPtr_s = NULL;
     50    ManageScopedSingleton(NotificationManager, ScopeID::Root);
    4951
    5052    /**
  • code/branches/core5/src/modules/questsystem/notifications/NotificationManager.h

    r5850 r5867  
    4141#include <string>
    4242
    43 #include "util/ScopedSingleton.h"
     43#include "util/Singleton.h"
    4444#include "core/OrxonoxClass.h"
    4545
     
    5353        Damian 'Mozork' Frick
    5454    */
    55     class _QuestsystemExport NotificationManager : public ScopedSingleton<NotificationManager, ScopeID::Root>, public OrxonoxClass
     55    class _QuestsystemExport NotificationManager : public Singleton<NotificationManager>, public OrxonoxClass
    5656    {
    57             friend class ScopedSingleton<NotificationManager, ScopeID::Root>;
     57            friend class Singleton<NotificationManager>;
    5858        public:
    5959            NotificationManager();
Note: See TracChangeset for help on using the changeset viewer.