diff options
| -rw-r--r-- | TAO/ChangeLog-99c | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h | 11 |
2 files changed, 15 insertions, 3 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 95d010355e9..9337a31000a 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,10 @@ +Thu May 20 21:28:25 1999 Nagarajan Surendran <naga@cs.wustl.edu> + + * orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}: + Fixed a few MSVC warnings and prefixed the Direction enumeration + to DIR_ since IN,OUT and INOUT are MSVC keywords. + + Thu May 20 21:09:29 1999 Jeff Parsons <parsons@cs.wustl.edu> * tao/DomainC.cpp: diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 0395e251ff0..74b85c9b506 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -994,8 +994,8 @@ public: protected: ACE_Array<char*> token_array_; - int count_; - int num_tokens_; + size_t count_; + size_t num_tokens_; }; class TAO_ORBSVCS_Export TAO_FlowSpec_Entry @@ -1003,7 +1003,12 @@ class TAO_ORBSVCS_Export TAO_FlowSpec_Entry public: // = TITLE // An helper entry class in the flow spec sequence passed to bind_devs. - enum Direction {INVALID=-1,IN=0,OUT=1,INOUT=2}; + enum Direction + { + INVALID = -1, + DIR_IN = 0, + DIR_OUT = 1, + DIR_INOUT = 2}; TAO_FlowSpec_Entry (void); // constructor. |