diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-10-20 09:46:10 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-10-20 09:46:10 +0000 |
| commit | 02686f8d5108580e8a3d56bfe9b124405fdedd18 (patch) | |
| tree | 0426ac218b7505e1c06dbf5ff8d2b10144d7ce75 /TAO/performance-tests | |
| parent | b2334408ebeffc6686b1f976247926df8411caec (diff) | |
| download | ATCD-02686f8d5108580e8a3d56bfe9b124405fdedd18.tar.gz | |
Tue Oct 20 09:30:13 UTC 2011 Martin Corino <mcorino@remedy.nl>
Merged changes from Remedy work branch.
Diffstat (limited to 'TAO/performance-tests')
| -rw-r--r-- | TAO/performance-tests/Anyop/anyop.cpp | 3 | ||||
| -rw-r--r-- | TAO/performance-tests/Throughput/Receiver_Factory.h | 9 |
2 files changed, 1 insertions, 11 deletions
diff --git a/TAO/performance-tests/Anyop/anyop.cpp b/TAO/performance-tests/Anyop/anyop.cpp index fd82626063f..afaa7e0cf1c 100644 --- a/TAO/performance-tests/Anyop/anyop.cpp +++ b/TAO/performance-tests/Anyop/anyop.cpp @@ -83,8 +83,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar"); Param_Test_var param_test = - TAO::Narrow_Utils<Param_Test>::unchecked_narrow (obj.in (), - 0); + TAO::Narrow_Utils<Param_Test>::unchecked_narrow (obj.in ()); TAO_Stub *stub = param_test->_stubobj (); stub->type_id = CORBA::string_dup ("IDL:Param_Test:1.0"); diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.h b/TAO/performance-tests/Throughput/Receiver_Factory.h index ea8ec3ff2a9..4ccf75b421b 100644 --- a/TAO/performance-tests/Throughput/Receiver_Factory.h +++ b/TAO/performance-tests/Throughput/Receiver_Factory.h @@ -8,11 +8,6 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Receiver_Factory interface class Receiver_Factory : public virtual POA_Test::Receiver_Factory @@ -31,9 +26,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* THROUGHPUT_RECEIVER_FACTORY_H */ |