1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
--- orig/CSD_FrameworkC.h 2005-10-20 11:20:03.234375000 -0700
+++ CSD_FrameworkC.h 2005-10-20 11:26:07.578125000 -0700
@@ -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:
@@ -47,7 +47,7 @@
#include "tao/Object.h"
#include "tao/Objref_VarOut_T.h"
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/PortableServer/PortableServer.h"
#if defined (TAO_EXPORT_MACRO)
#undef TAO_EXPORT_MACRO
@@ -305,13 +305,6 @@
#endif /* end #if !defined */
}
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:1040
-
-#if defined (__ACE_INLINE__)
-#include "CSD_FrameworkC.inl"
-#endif /* defined INLINE */
-
#include /**/ "ace/post.h"
#endif /* ifndef */
--- orig/CSD_FrameworkC.cpp 2005-10-20 11:20:03.234375000 -0700
+++ CSD_FrameworkC.cpp 2005-10-20 11:22:19.171875000 -0700
@@ -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:
@@ -33,9 +33,6 @@
#include "tao/CDR.h"
#include "ace/OS_NS_string.h"
-#if !defined (__ACE_INLINE__)
-#include "CSD_FrameworkC.inl"
-#endif /* !defined INLINE */
// TAO_IDL - Generated from
// .\be\be_visitor_arg_traits.cpp:70
--- orig/CSD_FrameworkA.h 2005-10-20 11:20:03.250000000 -0700
+++ CSD_FrameworkA.h 2005-10-20 11:26:42.359375000 -0700
@@ -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,8 +34,8 @@
#include /**/ "ace/pre.h"
#include "CSD_FW_Export.h"
-#include "tao/orig/CSD_FrameworkC.h"
-#include "tao/PortableServer/PortableServerA.h"
+#include "CSD_FrameworkC.h"
+//#include "tao/PortableServer/PortableServerA.h"
// TAO_IDL - Generated from
--- orig/CSD_FrameworkA.cpp 2005-10-20 11:20:03.234375000 -0700
+++ CSD_FrameworkA.cpp 2005-10-20 11:23:07.562500000 -0700
@@ -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:
|
