diff -r 942573423a60 -r fa67e03b87df connectivitylayer/isce/isirouter_dll/inc/isirouter.h --- a/connectivitylayer/isce/isirouter_dll/inc/isirouter.h Fri Jan 22 10:04:04 2010 +0200 +++ b/connectivitylayer/isce/isirouter_dll/inc/isirouter.h Wed Feb 17 13:58:55 2010 +0200 @@ -24,8 +24,11 @@ #include "misilinkrouterif.h" // For MISILinkRouterIf #include "misichannelrouterif.h" // For MISIChannelRouterIf #include "isiinternaldefs.h" // For KMaxAmountOfObjId +//#include "misiobjectrouterif.h" + class MISIRouterChannelIf; +class MISIRouterObjectIf; class MISIRouterLinkIf; class DISICLTransceiver; class DISIThreadContainer; @@ -123,10 +126,14 @@ static void InitializeDfc( TAny* aPtr ); - private: - + public: // Written only once no need to synch. - static DISIRouter* iSelfPtr; + static DISIRouter* iSelfPtr; + MISIRouterObjectIf* iNameService; + MISIRouterObjectIf* iCommunicationManager; + + private: + // Owned, synchronized internally with fastmutexes. RArray< TStaticId* > iStaticObjIdTable; // Owned, synchronized internally with fastmutexes. @@ -139,6 +146,7 @@ DISICLTransceiver* iCLTransceiver; DISIThreadContainer* iClientThreadContainer; + }; #endif /* __ISIROUTER_H__ */