Changeset 21025

Timestamp:

02/10/08 07:39:15 (7 months ago)

Author:

patrick

Message:

Simplify the implementation of this class by deriving from boost::noncopyable.

Files:

• juggler/trunk/modules/tweek/tweek/CORBA/SubjectManagerImpl.cpp (modified) (1 diff)
• juggler/trunk/modules/tweek/tweek/CORBA/SubjectManagerImpl.h (modified) (3 diffs)

juggler/trunk/modules/tweek/tweek/CORBA/SubjectManagerImpl.cpp

@@ -300 +300 @@
-}
-
-SubjectManagerImpl::SubjectManagerImpl(const SubjectManagerImpl& sm)
-   :
-#if defined(TWEEK_USE_OMNIORB)
-     omniServant(sm)
-   , tweek::_impl_SubjectManager(sm)
-   ,
-#elif defined(TWEEK_USE_TAO)
-     TAO_Abstract_ServantBase(sm)
-   ,
-#endif
-     PortableServer::ServantBase(sm)
-   , POA_tweek::SubjectManager(sm)
-   , PortableServer::RefCountServantBase(sm)
-   , mCorbaMgr(sm.mCorbaMgr)
-   , mName(sm.mName)
-   , mInfoMap(sm.mInfoMap)
-{
-   /* Do nothing. */ ;
-}
-
-} // End of tweek namespace

juggler/trunk/modules/tweek/tweek/CORBA/SubjectManagerImpl.h

@@ -32 +32 @@
-#include <string>
-#include <map>
+#include <boost/noncopyable.hpp>
+
-#include <vpr/vpr.h>
-#include <vpr/Sync/Mutex.h>
@@ -56 +58 @@
- */
-class TWEEK_CLASS_API SubjectManagerImpl
-
+
+
-   , public PortableServer::RefCountServantBase
-{
@@ -184 +187 @@
-   SubjectManagerImpl(const CorbaManager& corbaMgr, const std::string& name);
-
-   // These two have to be here because Visual C++ will try to make them
-   // exported public symbols.  This causes problems because copying
-   // vpr::Mutex objects is not allowed.
-   SubjectManagerImpl(const SubjectManagerImpl& sm);
-
-   void operator=(const SubjectManagerImpl&)
-   {
-      /* Do nothing. */ ;
-   }
-
-   void storeSubject(Subject_ptr subject, const std::string& name);
-