diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-12-12 16:02:27 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-12-12 16:02:27 +0100 |
| commit | 37a525baec16f7caaa2252394041051c949f301d (patch) | |
| tree | d02343e8d3b24655b082b117d63879ff83e89e7f /TAO/tao/PI_Server/ServerRequestInfo.h | |
| parent | 87e4cdb2c157eb359d394c40115e0e6a91c68920 (diff) | |
| parent | 7f58353152673a611a86843b1db6f9453675d087 (diff) | |
| download | ATCD-37a525baec16f7caaa2252394041051c949f301d.tar.gz | |
Fixed merge conflicts
Diffstat (limited to 'TAO/tao/PI_Server/ServerRequestInfo.h')
| -rw-r--r-- | TAO/tao/PI_Server/ServerRequestInfo.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index 279a231b79c..47b36ca9678 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.h +++ b/TAO/tao/PI_Server/ServerRequestInfo.h @@ -107,7 +107,7 @@ namespace TAO /// Return the @c sync_scope policy value for the current one-way /// operation. If the operation is not a one-way, a /// @c CORBA::BAD_INV_ORDER exception is thrown. - virtual Messaging::SyncScope sync_scope (); + virtual ::Messaging::SyncScope sync_scope (); /// Return the reply status for the current request. /** @@ -188,7 +188,6 @@ namespace TAO * @name Helper methods specific to TAO. */ //@{ - /// Extract the forward object reference from the /// @c PortableInterceptor::ForwardRequest exception, and set the /// reply status flag accordingly. @@ -239,7 +238,6 @@ namespace TAO /// The number of elements in the @c exceptions_ array. CORBA::ULong const nexceptions_; }; - } // End namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL |