diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-06-07 09:39:44 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-06-07 10:35:52 +0200 |
| commit | d4139bda50f6c91fd0678532c45738b676522da6 (patch) | |
| tree | d7d85599cee70dd283272761192582de048fd461 | |
| parent | aba735a1c24cf635fb0b5b15ae98d9419d1780c7 (diff) | |
| download | ATCD-d4139bda50f6c91fd0678532c45738b676522da6.tar.gz | |
Fixed merge conflicts
| -rw-r--r-- | TAO/tao/PI_Server/ServerRequestInfo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index af0274b0509..baefbdda34b 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.h +++ b/TAO/tao/PI_Server/ServerRequestInfo.h @@ -108,7 +108,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 (void); + virtual ::Messaging::SyncScope sync_scope (void); /// Return the reply status for the current request. /** |