diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-08 20:59:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-08 20:59:06 +0100 |
| commit | 199259c5d2d5f4a6550382a683f5d54ac482fcd1 (patch) | |
| tree | 6792423092c40e0e26f9b6ed932706b4a18fcfc7 /TAO/tao/Blocked_Connect_Strategy.h | |
| parent | a2239fcbf8a7eabce628ca0841dc1eaa69a68b3d (diff) | |
| parent | 0ef8b2250c1dfad5ad5361de7e92a289ead06733 (diff) | |
| download | ATCD-199259c5d2d5f4a6550382a683f5d54ac482fcd1.tar.gz | |
Merge pull request #1444 from jwillemsen/jwi-stdstring
Use std string operation instead of ACE_OS
Diffstat (limited to 'TAO/tao/Blocked_Connect_Strategy.h')
| -rw-r--r-- | TAO/tao/Blocked_Connect_Strategy.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/tao/Blocked_Connect_Strategy.h b/TAO/tao/Blocked_Connect_Strategy.h index df6e230a09f..404eb2d3be7 100644 --- a/TAO/tao/Blocked_Connect_Strategy.h +++ b/TAO/tao/Blocked_Connect_Strategy.h @@ -36,12 +36,12 @@ public: * Concrete implementation for this class. Please see * Connect_Strategy.h for details */ - virtual void synch_options (ACE_Time_Value *val, ACE_Synch_Options &opt); + void synch_options (ACE_Time_Value *val, ACE_Synch_Options &opt) override; protected: - virtual int wait_i (TAO_LF_Event *ev, - TAO_Transport *t, - ACE_Time_Value *val); + int wait_i (TAO_LF_Event *ev, + TAO_Transport *t, + ACE_Time_Value *val) override; }; TAO_END_VERSIONED_NAMESPACE_DECL |