diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-04-10 03:41:05 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-04-10 03:41:05 +0000 |
| commit | b003ca59fe8c3023de887d08b2d05357246024f5 (patch) | |
| tree | 6f0ef442988587fe23faffaadd602581233c83ec /CIAO | |
| parent | 62904f74955373ff396b6e2a58e09a601c65f52e (diff) | |
| download | ATCD-b003ca59fe8c3023de887d08b2d05357246024f5.tar.gz | |
Sun Apr 10 03:40:52 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp:
Compile error.
Diffstat (limited to 'CIAO')
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index ff4f394346a..41cdc5b4f99 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Sun Apr 10 03:40:52 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp: + + Compile error. + Sat Apr 9 17:47:00 UTC 2011 Martin Corino <mcorino@remedy.nl> Merged changes from Remedy work branch. diff --git a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp index 5ef33ae41fc..c4cf60b2a48 100644 --- a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp +++ b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp @@ -86,7 +86,7 @@ namespace CIAO_Launch_Failure_Impl */ Launch_Failure_exec_i::Launch_Failure_exec_i (void) - : failure_reason_ (NO_ERROR) + : failure_reason_ (::NO_ERROR) { } @@ -101,7 +101,7 @@ namespace CIAO_Launch_Failure_Impl ::CCM_Remote_Interface_ptr Launch_Failure_exec_i::get_remote_out (void) { - if (this->failure_reason_ == FACET_REFERENCE_EXCEPTION) + if (this->failure_reason_ == ::FACET_REFERENCE_EXCEPTION) { throw 1; } @@ -126,7 +126,7 @@ namespace CIAO_Launch_Failure_Impl ::CCM_Local_Interface_ptr Launch_Failure_exec_i::get_local_out (void) { - if (this->failure_reason_ == FACET_REFERENCE_EXCEPTION) + if (this->failure_reason_ == ::FACET_REFERENCE_EXCEPTION) { throw 1; } |