diff options
Diffstat (limited to 'TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff')
| -rw-r--r-- | TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff index 23128eda6e1..0029a3af050 100644 --- a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff +++ b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff @@ -1,22 +1,31 @@ ---- orig/BiDirPolicyC.h 2003-11-03 21:04:56.000000000 -0600 -+++ BiDirPolicyC.h 2003-11-03 21:20:15.000000000 -0600 -@@ -48,7 +48,7 @@ +--- orig/BiDirPolicyC.h 2004-11-09 16:09:54.752499200 +0100 ++++ BiDirPolicyC.h 2004-11-09 16:14:36.808075200 +0100 +@@ -33,6 +33,9 @@ + + #include /**/ "ace/pre.h" + ++#ifndef TAO_BIDIRGIOP_SAFE_INCLUDE ++#error "You should not include BiDirPolicyC.h directly, use BiDirGIOP.h" ++#endif /* !TAO_BIDIRGIOP_SAFE_INCLUDE */ + + #include "ace/config-all.h" + +@@ -47,6 +50,8 @@ #include "tao/Object.h" #include "tao/Objref_VarOut_T.h" - --#include "PolicyC.h" + +#include "tao/PolicyC.h" - ++ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO ---- orig/BiDirPolicyC.cpp 2003-11-03 21:04:10.000000000 -0600 -+++ BiDirPolicyC.cpp 2003-11-03 21:19:02.000000000 -0600 + #endif +--- orig\BiDirPolicyC.cpp 2005-01-04 20:49:10.788272000 +0100 ++++ BiDirPolicyC.cpp 2005-01-04 20:47:44.974878400 +0100 @@ -29,7 +29,7 @@ - // be/be_codegen.cpp:302 - - + // be\be_codegen.cpp:302 + + -#include "BiDirPolicyC.h" +#include "BiDirGIOP.h" + #include "tao/CDR.h" #include "ace/OS_NS_string.h" - - #if defined (__BORLANDC__) |