diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-05-19 13:24:54 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-05-19 13:24:54 +0000 |
| commit | 0c60e947b066ea14ffca575977ae4ec6167a2756 (patch) | |
| tree | 3fe6ee1e5b3f66ddb65e447c74e2143fe349daf0 | |
| parent | 662595e4d0f943823add7e9062e1c3c37a5fe077 (diff) | |
| download | ATCD-0c60e947b066ea14ffca575977ae4ec6167a2756.tar.gz | |
Sun May 19 13:20:04 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b0d9be63cac..384aeec83ed 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Sun May 19 13:20:04 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp: + + fix compile issue on platforms that don't have interceptors enabled. + Fri May 17 19:02:02 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/ImplRepo_Service/AsyncListManager.cpp: diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp index 467473244de..7d600b3d76b 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp @@ -264,7 +264,7 @@ TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_ServerRequest*& request) // ACTION: Primitive data type assignment. clone_obj->argument_flag_ = request->argument_flag_; - //#if TAO_HAS_INTERCEPTORS == 1 + #if TAO_HAS_INTERCEPTORS == 1 // TYPE: size_t // ACTION: Primitive data type assignment. clone_obj->interceptor_count_ = request->interceptor_count_; @@ -281,7 +281,7 @@ TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_ServerRequest*& request) // Just leave this alone for a clone. // //clone_obj->result_seq_ = request->result_seq_; - //#endif /* TAO_HAS_INTERCEPTORS == 1 */ + #endif /* TAO_HAS_INTERCEPTORS == 1 */ if (clone_obj->transport_ != 0) { |