diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index fa2b83e410c..2599f0b91c5 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Wed Dec 13 23:57:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp: + + Fixed a warning in MSVC about */*...*/ being mistakenly + recognized as a */ found outside a comment. + Wed Dec 13 23:56:58 2000 Ossama Othman <ossama@uci.edu> * tao/TAO.dsp: diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index 6d3a5485bda..0c84e037f94 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -423,7 +423,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects (int /*argc*/, - char **/*argv*/, + char ** /*argv*/, CORBA::Environment &ACE_TRY_ENV) { ACE_TRY |