diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-08-18 14:22:10 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-08-18 14:22:10 +0000 |
| commit | b9624019aca6bc2e1885f1629b07fc1286ec34c8 (patch) | |
| tree | 51112d25c7238c7104a4a76113713d3b88ec0328 | |
| parent | 9a24226f70e95f4051736f0abd0013ef7e00c7bf (diff) | |
| download | ATCD-b9624019aca6bc2e1885f1629b07fc1286ec34c8.tar.gz | |
ChangeLogTag: Wed Aug 18 14:21:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 21 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h | 5 |
2 files changed, 18 insertions, 8 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index cb70106010b..74c9f0715c0 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 18 14:21:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/NodeManager/NodeDaemon_Impl.h: + Added missing pragma pop + Mon Aug 16 22:15:52 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp: @@ -29,12 +34,12 @@ Mon Aug 16 16:44:13 2004 J.T. Conklin <jtc@acorntoolworks.com> Mon Aug 16 16:36:49 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - + Changed conversion for eventtypes to generate, instead of the original eventtype, a valuetype with Components::EventBase added to its inheritance list. This is completely equivalent to the original eventtype and has the advantage that it eliminates the - need to use the -Sm option (disabling CCM equivalent IDL + need to use the -Sm option (disabling CCM equivalent IDL preprocessing) when running the IDL compiler on a converted file. Thanks to Bala Natarajan <bala@dre.vanderbilt.edu> for the suggestion. @@ -42,7 +47,7 @@ Mon Aug 16 16:36:49 2004 Jeff Parsons <j.parsons@vanderbilt.edu> Mon Aug 16 14:14:15 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl: - + Do not do the compile the implied data part of the IDL. Mon Aug 16 12:42:59 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> @@ -75,14 +80,14 @@ Mon Aug 16 12:42:59 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * DAnCE/Config_Handlers/TPD_Handler.h: * DAnCE/Config_Handlers/Utils.h: - Use ciao/ to include any header files from core ciao. - + Use ciao/ to include any header files from core ciao. + * DAnCE/ciao/CCM_Core.mpc: * DAnCE/tests/Config_Handlers/handler_test.mpb: * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc: Use the right libraries for linking. This should probably - address some of the core build errors on the scoreboard. + address some of the core build errors on the scoreboard. Sun Aug 15 18:32:49 2004 Jeff Parsons <j.parsons@vanderbilt.edu> @@ -100,7 +105,7 @@ Sun Aug 15 18:32:49 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: * tools/IDL3_to_IDL2/README: - + New files implementing a tool that inputs an IDL file with IDL3 constructs and generates another IDL file with the IDL3 constructs converted to the spec-defined IDL2 equivalents. Using @@ -120,7 +125,7 @@ Sun Aug 15 09:12:36 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * DAnCE/tests/Config_Handlers/handler_test.mpb: - Fixed the handlers to link in CIAO_DnC_Container too. + Fixed the handlers to link in CIAO_DnC_Container too. Sat Aug 14 14:44:24 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h index 266d54c77f8..a30fe5a2244 100644 --- a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h +++ b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h @@ -123,6 +123,11 @@ namespace CIAO Deployment::NodeApplicationManager_var manager_; }; } + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + #if defined (__ACE_INLINE__) # include "NodeDaemon_Impl.inl" #endif /* __ACE_INLINE__ */ |