summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-11-02 21:10:50 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-11-02 21:10:50 +0000
commit3d67ffa3fdd3a78daa1557fec5d12d65d55abea1 (patch)
tree32dcc301c0d2a49d0451047641b8d02b9856da81
parent2536892d15cf0d423f44bef6f2dd3db179569abf (diff)
downloadATCD-3d67ffa3fdd3a78daa1557fec5d12d65d55abea1.tar.gz
ChangeLogTag: Thu Nov 2 20:53:16 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/tests/IDL_Test/nested_scope.idl20
1 files changed, 11 insertions, 9 deletions
diff --git a/TAO/tests/IDL_Test/nested_scope.idl b/TAO/tests/IDL_Test/nested_scope.idl
index d0e3dc6d966..b36ce32cdb1 100644
--- a/TAO/tests/IDL_Test/nested_scope.idl
+++ b/TAO/tests/IDL_Test/nested_scope.idl
@@ -9,7 +9,7 @@
// nested_scope.idl
//
// = DESCRIPTION
-// This file contains examples of IDL code that has
+// This file contains examples of IDL code that has
// caused problems in the past for the TAO IDL
// compiler. This test is to make sure the problems
// stay fixed.
@@ -26,7 +26,7 @@ module skip
{
module hump
{
- struct skip {short s;};
+ struct skip {short s;};
};
};
@@ -142,11 +142,11 @@ module bug_1985_c
// This one caused several problems - in the stub declaration of
// the operation, and in the skeleton body's allocation of return type.
module Negotiator
-{
+{
interface UAV_Negotiator {};
interface UAV_Negotiator_Factory : ::Negotiator::UAV_Negotiator
- {
+ {
::Negotiator::UAV_Negotiator make_negotiator (in string bitrate_sc);
};
};
@@ -154,19 +154,19 @@ module Negotiator
// Caught some generation of arg helper template parameters not using
// the qualifying '::' on scoped names.
-module bug_2125
+module bug_2125
{
- module Bar
+ module Bar
{
enum Stuff {ONE, TWO};
};
};
-module Wow
+module Wow
{
- module bug_2125
+ module bug_2125
{
- interface MyInterface
+ interface MyInterface
{
void op1 (in bug_2125::Bar::Stuff fbs);
void op2 (in ::bug_2125::Bar::Stuff fbs);
@@ -180,6 +180,8 @@ module Company
{
module CORBA
{
+ typedef unsigned long LongU;
+
module Inner
{
struct Foo