← Back to branch summary

~ubuntu-branches/ubuntu/breezy/ace/breezy

« back to all changes in this revision

Viewing changes to TAO/tao/DynamicAny/diffs/DynamicAny.diff

  • Committer: Bazaar Package Importer
  • Author(s): Adam Conrad, Benjamin Montgomery, Adam Conrad
  • Date: 2005-09-18 22:51:38 UTC
  • mfrom: (1.2.1 upstream) (2.1.1 sarge) (0.1.2 woody)
  • Revision ID: james.westby@ubuntu.com-20050918225138-seav22q6fyylb536
Tags: 5.4.7-3ubuntu1
[ Benjamin Montgomery ]
* Added a patch for amd64 and powerpc that disables the compiler
  option -fvisibility-inlines-hidden

[ Adam Conrad ]
* Added DPATCH_OPTION_CPP=1 to debian/patches/00options to make
  Benjamin's above changes work correctly with dpatch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
TAO/tao/DynamicAny/diffs/DynamicAny.diff
1
 
--- orig/DynamicAnyC.h  Wed Feb  6 11:11:22 2002
2
 
+++ DynamicAnyC.h       Wed Feb  6 11:17:29 2002
3
 
@@ -22,6 +22,10 @@
4
 
 #ifndef _TAO_IDL_ORIG_DYNAMICANYC_H_
5
 
 #define _TAO_IDL_ORIG_DYNAMICANYC_H_
6
 
 
7
 
+#ifndef TAO_DYNAMICANY_SAFE_INCLUDE
8
 
+#error "You should not include DynamicAnyC.h directly, use DynamicAny.h"
9
 
+#endif /* !TAO_DYNAMICANY_SAFE_INCLUDE */
10
 
+
11
 
 #include "ace/pre.h"
12
 
 #include "tao/corba.h"
13
 
 
14
 
@@ -1650,7 +1654,7 @@
15
 
         , DynamicAny::DynAny::InvalidValue
16
 
       )) = 0;
17
 
     
18
 
-    virtual ::TCKind current_member_kind (
19
 
+    virtual CORBA::TCKind current_member_kind (
20
 
         
21
 
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
22
 
       )
23
 
@@ -1868,7 +1872,7 @@
24
 
         CORBA::SystemException
25
 
       )) = 0;
26
 
     
27
 
-    virtual ::TCKind discriminator_kind (
28
 
+    virtual CORBA::TCKind discriminator_kind (
29
 
         
30
 
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
31
 
       )
32
 
@@ -1894,7 +1898,7 @@
33
 
         , DynamicAny::DynAny::InvalidValue
34
 
       )) = 0;
35
 
     
36
 
-    virtual ::TCKind member_kind (
37
 
+    virtual CORBA::TCKind member_kind (
38
 
         
39
 
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
40
 
       )
41
 
@@ -2716,7 +2720,7 @@
42
 
         , DynamicAny::DynAny::InvalidValue
43
 
       )) = 0;
44
 
     
45
 
-    virtual ::TCKind current_member_kind (
46
 
+    virtual CORBA::TCKind current_member_kind (
47
 
         
48
 
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
49
 
       )
50
 
--- orig/DynamicAnyC.cpp        Wed Feb  6 11:11:22 2002
51
 
+++ DynamicAnyC.cpp     Wed Feb  6 11:15:25 2002
52
 
@@ -19,7 +19,7 @@
53
 
 // Information about TAO is available at:
54
 
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
55
 
 
56
 
-#include "DynamicAnyC.h"
57
 
+#include "DynamicAny.h"
58
 
 
59
 
 #include "tao/Stub.h"
60
 
 #include "tao/Invocation.h"