diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-22 17:37:48 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-22 17:37:48 +0000 |
| commit | e2c866440d5703478e8ef0e9da47c4d590454865 (patch) | |
| tree | 8ec6c39e6c541a93ecbf869415ed09d84c68cd25 | |
| parent | c9241a4d136cb08e049410d562e3e22d108a0b6b (diff) | |
| download | ATCD-e2c866440d5703478e8ef0e9da47c4d590454865.tar.gz | |
ChangeLogTag:Sat Feb 22 09:37:29 2003 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLog | 13 | ||||
| -rw-r--r-- | TAO/tao/DynamicInterface/Makefile.bor | 2 | ||||
| -rw-r--r-- | TAO/tao/ORB.h | 5 |
3 files changed, 16 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 36c62c19508..ba1aa097377 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,16 @@ +Sat Feb 22 09:37:29 2003 Ossama Othman <ossama@uci.edu> + + * tao/ORB.h (ORB): + + Qualify the TAO_ORB_Core friend declaration with the global + scope ("::") qualifier. Addresses a problem where some + compilers assume that the TAO_ORB_Core declaration actually + resides in the CORBA namespace. + + * tao/DynamicInterface/Makefile.bor (OBJFILES): + + Fixed syntax error. + Sat Feb 22 09:06:45 2003 Ossama Othman <ossama@uci.edu> * tao/ValueFactory.h (TAO_OBV_CREATE_RETURN_TYPE): diff --git a/TAO/tao/DynamicInterface/Makefile.bor b/TAO/tao/DynamicInterface/Makefile.bor index 0044dcf9f74..44fe222c1eb 100644 --- a/TAO/tao/DynamicInterface/Makefile.bor +++ b/TAO/tao/DynamicInterface/Makefile.bor @@ -7,7 +7,7 @@ NAME = TAO_DynamicInterface OBJFILES = \ $(OBJDIR)\Context.obj \ $(OBJDIR)\DII_Invocation.obj \ - $(OBJDIR)\DII_ClientRequestInfo.obj: + $(OBJDIR)\DII_ClientRequestInfo.obj \ $(OBJDIR)\DII_Reply_Dispatcher.obj \ $(OBJDIR)\Dynamic_Adapter_Impl.obj \ $(OBJDIR)\Dynamic_Implementation.obj \ diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index c324c45e4f8..8002d700aec 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -87,8 +87,7 @@ namespace CORBA public: // ORB_Core has special privileges - friend class TAO_ORB_Core; - //friend TAO_Export TAO_ORB_Core *TAO_ORB_Core_instance (void); + friend class ::TAO_ORB_Core; class TAO_Export InvalidName : public CORBA::UserException { @@ -379,7 +378,7 @@ namespace CORBA * This operation performs an implementation-defined unit of work. * Note that the default behavior is to block if the unit of work * is not present; this behavior can be modified by passing an - * appropriate @c ACE_Time_Value as described in run(). + * appropriate @c ACE_Time_Value as described in run(). **/ void perform_work (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); void perform_work (ACE_Time_Value & |