diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-11-28 18:01:50 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-11-28 18:01:50 +0000 |
| commit | 85f5b56dd77dfd6141df00c82a306f0c4987c817 (patch) | |
| tree | 83f182fa898044ddf656320ee1e4fe4e8db6fb09 | |
| parent | fdd2f9034ccfca295884dea2168f501f9a207159 (diff) | |
| download | ATCD-85f5b56dd77dfd6141df00c82a306f0c4987c817.tar.gz | |
ChangeLogTag:Sun Nov 28 18:00:30 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 14 | ||||
| -rw-r--r-- | TAO/tao/IORInterceptor/IORInterceptor.pidl | 3 | ||||
| -rw-r--r-- | TAO/tao/IORInterceptor/IORInterceptorC.h | 2 | ||||
| -rw-r--r-- | TAO/tao/IORInterceptor/diff/IORInterceptor.diff | 39 |
4 files changed, 57 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7b3c3ece012..a6d515ee683 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Sun Nov 28 18:00:30 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/IORInterceptor/IORInterceptor.pidl: + + Added some documentation for applying diffs. + + * tao/IORInterceptor/IORInterceptorC.h: + + Cosmetic hand craft to minimize the number of lines of diffs. + + * tao/IORInterceptor/diff/IORInterceptor.diff: + + New file for maintenence. + Sun Nov 28 17:41:37 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/IORInterceptor/IORInterceptor.h: diff --git a/TAO/tao/IORInterceptor/IORInterceptor.pidl b/TAO/tao/IORInterceptor/IORInterceptor.pidl index 1013e104599..d3dc26bcb04 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor.pidl +++ b/TAO/tao/IORInterceptor/IORInterceptor.pidl @@ -27,6 +27,9 @@ * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" * IORInterceptor.pidl + * + * Please apply the patch in IORInterceptor.diff to the generated stubs and + * skeletons. */ // File: IORInterceptor.idl diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h index 617a426dc43..c9f31d72b1d 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.h +++ b/TAO/tao/IORInterceptor/IORInterceptorC.h @@ -33,10 +33,10 @@ #include /**/ "ace/pre.h" + #ifndef TAO_IORINTERCEPTOR_SAFE_INCLUDE #error "You should not include IORInterceptorC.h directly, use IORInterceptor.h" #endif /* !TAO_IORINTERCEPTOR_SAFE_INCLUDE */ - #include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/IORInterceptor/diff/IORInterceptor.diff b/TAO/tao/IORInterceptor/diff/IORInterceptor.diff new file mode 100644 index 00000000000..70ecb288508 --- /dev/null +++ b/TAO/tao/IORInterceptor/diff/IORInterceptor.diff @@ -0,0 +1,39 @@ +--- orig/IORInterceptorC.h 2004-11-28 16:29:19.000000000 +0000 ++++ IORInterceptorC.h 2004-11-28 17:49:39.000000000 +0000 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ + + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: +@@ -34,6 +34,9 @@ + #include /**/ "ace/pre.h" + + ++#ifndef TAO_IORINTERCEPTOR_SAFE_INCLUDE ++#error "You should not include IORInterceptorC.h directly, use IORInterceptor.h" ++#endif /* !TAO_IORINTERCEPTOR_SAFE_INCLUDE */ + #include "ace/config-all.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) +--- orig/IORInterceptorC.cpp 2004-11-28 16:29:19.000000000 +0000 ++++ IORInterceptorC.cpp 2004-11-28 17:47:42.000000000 +0000 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ + + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: +@@ -29,7 +29,7 @@ + // be/be_codegen.cpp:301 + + +-#include "IORInterceptorC.h" ++#include "IORInterceptor.h" + #include "tao/CDR.h" + #include "ace/OS_NS_string.h" + |